tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char / misc fixes from Greg Kroah-Hartman:
"Here are some small mei driver fixes for 3.10-rc6 that fix some
reported problems"

* tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
mei: me: clear interrupts on the resume path
mei: nfc: fix nfc device freeing
mei: init: Flush scheduled work before resetting the device

Linus Torvalds 9bb92855 3ad2e318

+5 -2
+2 -2
drivers/misc/mei/init.c
··· 197 197 { 198 198 dev_dbg(&dev->pdev->dev, "stopping the device.\n"); 199 199 200 + flush_scheduled_work(); 201 + 200 202 mutex_lock(&dev->device_lock); 201 203 202 204 cancel_delayed_work(&dev->timer_work); ··· 211 209 mei_reset(dev, 0); 212 210 213 211 mutex_unlock(&dev->device_lock); 214 - 215 - flush_scheduled_work(); 216 212 217 213 mei_watchdog_unregister(dev); 218 214 }
+2
drivers/misc/mei/nfc.c
··· 142 142 mei_cl_unlink(ndev->cl_info); 143 143 kfree(ndev->cl_info); 144 144 } 145 + 146 + memset(ndev, 0, sizeof(struct mei_nfc_dev)); 145 147 } 146 148 147 149 static int mei_nfc_build_bus_name(struct mei_nfc_dev *ndev)
+1
drivers/misc/mei/pci-me.c
··· 325 325 326 326 mutex_lock(&dev->device_lock); 327 327 dev->dev_state = MEI_DEV_POWER_UP; 328 + mei_clear_interrupts(dev); 328 329 mei_reset(dev, 1); 329 330 mutex_unlock(&dev->device_lock); 330 331