diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-10 14:42:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-10 14:42:33 +0300 |
| commit | 2d41d2ab85d414f6ea9eac2f853b1aa31ba0820f (patch) | |
| tree | 2b56ba6dc8bfa65535fc2e70ed61f40a1cbefe15 /drivers/misc/mei | |
| parent | 415abcdfd4b8326d679cd0c78bee00b5ceac9718 (diff) | |
| parent | 59d1d2e8e1e7c50d2657d5e4812b53f71f507968 (diff) | |
| download | linux-2d41d2ab85d414f6ea9eac2f853b1aa31ba0820f.tar.xz | |
Merge branch 'char-misc-linus' into 'char-misc-next'
We need the virtbox changes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
| -rw-r--r-- | drivers/misc/mei/bus.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c index 8d468e0a950a..f476dbc7252b 100644 --- a/drivers/misc/mei/bus.c +++ b/drivers/misc/mei/bus.c @@ -745,9 +745,8 @@ static int mei_cl_device_remove(struct device *dev) mei_cl_bus_module_put(cldev); module_put(THIS_MODULE); - dev->driver = NULL; - return ret; + return ret; } static ssize_t name_show(struct device *dev, struct device_attribute *a, |