aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/pci-me.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/mei/pci-me.c')
-rw-r--r--drivers/misc/mei/pci-me.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index a1a582b66f0d..88aec6a90ff4 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -190,7 +190,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
190 goto release_irq; 190 goto release_irq;
191 } 191 }
192 192
193 err = mei_register(&pdev->dev); 193 err = mei_register(dev);
194 if (err) 194 if (err)
195 goto release_irq; 195 goto release_irq;
196 196
@@ -262,12 +262,13 @@ static void mei_me_remove(struct pci_dev *pdev)
262 if (hw->mem_addr) 262 if (hw->mem_addr)
263 pci_iounmap(pdev, hw->mem_addr); 263 pci_iounmap(pdev, hw->mem_addr);
264 264
265 mei_deregister(dev);
266
265 kfree(dev); 267 kfree(dev);
266 268
267 pci_release_regions(pdev); 269 pci_release_regions(pdev);
268 pci_disable_device(pdev); 270 pci_disable_device(pdev);
269 271
270 mei_deregister();
271 272
272} 273}
273#ifdef CONFIG_PM 274#ifdef CONFIG_PM