diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
| commit | acd632eb64b6cd8e25583bb248c36aa937b8f021 (patch) | |
| tree | 993d276cbadb450fe8cf5e3c66d444a905d452e7 /drivers/misc/mei/main.c | |
| parent | 4b0c53e9e1a2a785746b2d379a32cb70b4dbb2fd (diff) | |
| parent | 5542b2aa9eea3f2bb922029c8cc4b4346c4f6b1c (diff) | |
| download | talos-obmc-linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.tar.gz talos-obmc-linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.zip | |
Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/misc/mei/main.c')
| -rw-r--r-- | drivers/misc/mei/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 8eb0a9500a90..e9513d651cd3 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c @@ -682,7 +682,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); |
