diff options
| author |   Alexander Usyskin <alexander.usyskin@intel.com> | 2014-06-23 15:10:35 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 14:19:34 -0700 |
| commit | f3d8e8788b4efbd13b6e888e85af51385d87d306 (patch) | |
| tree | ad51362c02ae6292c4da2bb7ff88a0d02b225a36 /drivers/misc/mei/pci-me.c | |
| parent | misc/GenWQE: fix pci_enable_msi usage (diff) | |
| download | linux-dev-f3d8e8788b4efbd13b6e888e85af51385d87d306.tar.xz linux-dev-f3d8e8788b4efbd13b6e888e85af51385d87d306.zip | |
mei: move from misc to char device
We need to support more then one mei interface
hence the simple misc devices is not longer an option
In order not break the user space a device with pci function 0
need to be linked to /dev/mei
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/pci-me.c')
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 1b46c64a649f..887ace14efa6 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -31,7 +31,6 @@ #include <linux/compat.h> #include <linux/jiffies.h> #include <linux/interrupt.h> -#include <linux/miscdevice.h> #include <linux/pm_runtime.h> @@ -207,7 +206,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pm_runtime_set_autosuspend_delay(&pdev->dev, MEI_ME_RPM_TIMEOUT); pm_runtime_use_autosuspend(&pdev->dev); - err = mei_register(dev); + err = mei_register(dev, &pdev->dev); if (err) goto release_irq; |