From: Tomas Winkler <tomas.winkler@intel.com>
Date: Thu, 18 Jun 2015 08:41:03 +0000 (+0300)
Subject: mei: prevent unloading mei hw modules while the device is opened.
X-Git-Tag: v4.1.5~37
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=35c8bade335f6d747f4567cfa5b678b6798a2187;p=users%2Fjedix%2Flinux-maple.git

mei: prevent unloading mei hw modules while the device is opened.

commit 154322f47376fed6ab1e4b350aa45fffa15a61aa upstream.

chrdev_open() increases reference counter on cdev->owner. Instead of
assigning the owner to mei subsystem, the owner has to be set to the
underlaying HW module (mei_me or mei_txe), so once the device is opened
the HW module cannot be unloaded.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 3e29681595064..e40bcd03bd47a 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -685,7 +685,7 @@ int mei_register(struct mei_device *dev, struct device *parent)
 	/* Fill in the data structures */
 	devno = MKDEV(MAJOR(mei_devt), dev->minor);
 	cdev_init(&dev->cdev, &mei_fops);
-	dev->cdev.owner = mei_fops.owner;
+	dev->cdev.owner = parent->driver->owner;
 
 	/* Add the device */
 	ret = cdev_add(&dev->cdev, devno, 1);