Skip to content

Commit 2463ae2

Browse files
ausyskingregkh
authored andcommitted
mei: txe: fix initialization order
The mei_register() should move before the mei_start() for hook on class device to work. Same change was implemented in mei-me, missed from mei-txe. Fixes: 7704e6b ("mei: hook mei_device on class device") Signed-off-by: Alexander Usyskin <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 87b318b commit 2463ae2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/misc/mei/pci-txe.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,19 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
109109
goto end;
110110
}
111111

112+
err = mei_register(dev, &pdev->dev);
113+
if (err)
114+
goto release_irq;
115+
112116
if (mei_start(dev)) {
113117
dev_err(&pdev->dev, "init hw failure.\n");
114118
err = -ENODEV;
115-
goto release_irq;
119+
goto deregister;
116120
}
117121

118122
pm_runtime_set_autosuspend_delay(&pdev->dev, MEI_TXI_RPM_TIMEOUT);
119123
pm_runtime_use_autosuspend(&pdev->dev);
120124

121-
err = mei_register(dev, &pdev->dev);
122-
if (err)
123-
goto stop;
124-
125125
pci_set_drvdata(pdev, dev);
126126

127127
/*
@@ -144,8 +144,8 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
144144

145145
return 0;
146146

147-
stop:
148-
mei_stop(dev);
147+
deregister:
148+
mei_deregister(dev);
149149
release_irq:
150150
mei_cancel_work(dev);
151151
mei_disable_interrupts(dev);

0 commit comments

Comments
 (0)