Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bb92855 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3ad2e318 42f132fe

drivers/misc/mei/init.c

+2 −2
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ void mei_stop(struct mei_device *dev) 
{

	dev_dbg(&dev->pdev->dev, "stopping the device.\n");



	flush_scheduled_work();



	mutex_lock(&dev->device_lock);



	cancel_delayed_work(&dev->timer_work);
@@ -210,8 +212,6 @@ void mei_stop(struct mei_device *dev) 


	mutex_unlock(&dev->device_lock);



	flush_scheduled_work();



	mei_watchdog_unregister(dev);

}

EXPORT_SYMBOL_GPL(mei_stop);

drivers/misc/mei/nfc.c

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ static void mei_nfc_free(struct mei_nfc_dev *ndev) 
		mei_cl_unlink(ndev->cl_info);

		kfree(ndev->cl_info);

	}



	memset(ndev, 0, sizeof(struct mei_nfc_dev));

}



static int mei_nfc_build_bus_name(struct mei_nfc_dev *ndev)

drivers/misc/mei/pci-me.c

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,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);