diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 20:54:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 20:54:25 +0200 |
| commit | 0e496b8e84410c96d1ffc86f0b37b0328a4234da (patch) | |
| tree | d8a2aeeaee03eb4f305ba4dc5ab9395c4ee31321 /drivers/misc/mei/pci-me.c | |
| parent | pcmcia: pd6729: fix error return code in pd6729_pci_probe() (diff) | |
| parent | Linux 3.10-rc6 (diff) | |
| download | linux-0e496b8e84410c96d1ffc86f0b37b0328a4234da.tar.xz linux-0e496b8e84410c96d1ffc86f0b37b0328a4234da.zip | |
Merge 3.10-rc6 into char-misc-next
We want the fixes in here.
Diffstat (limited to 'drivers/misc/mei/pci-me.c')
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index a2f5520f4060..1b3844e82379 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -306,6 +306,7 @@ static int mei_me_pci_resume(struct device *device) mutex_lock(&dev->device_lock); dev->dev_state = MEI_DEV_POWER_UP; + mei_clear_interrupts(dev); mei_reset(dev, 1); mutex_unlock(&dev->device_lock); |