Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / drivers / misc / mei / bus.c

diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 2907db260fba5ead002155992ac513e0fca3104a..935acc6bbf3c6e6192b03a52ea22c5c0fd57c51a 100644 (file)
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -44,7 +44,8 @@ ssize_t __mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, u8 vtag,
        bus = cl->dev;
 
        mutex_lock(&bus->device_lock);
-       if (bus->dev_state != MEI_DEV_ENABLED) {
+       if (bus->dev_state != MEI_DEV_ENABLED &&
+           bus->dev_state != MEI_DEV_POWERING_DOWN) {
                rets = -ENODEV;
                goto out;
        }
@@ -60,6 +61,13 @@ ssize_t __mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, u8 vtag,
                goto out;
        }
 
+       if (vtag) {
+               /* Check if vtag is supported by client */
+               rets = mei_cl_vt_support_check(cl);
+               if (rets)
+                       goto out;
+       }
+
        if (length > mei_cl_mtu(cl)) {
                rets = -EFBIG;
                goto out;
@@ -128,7 +136,8 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length, u8 *vtag,
        bus = cl->dev;
 
        mutex_lock(&bus->device_lock);
-       if (bus->dev_state != MEI_DEV_ENABLED) {
+       if (bus->dev_state != MEI_DEV_ENABLED &&
+           bus->dev_state != MEI_DEV_POWERING_DOWN) {
                rets = -ENODEV;
                goto out;
        }
@@ -878,22 +887,17 @@ static int mei_cl_device_probe(struct device *dev)
 static int mei_cl_device_remove(struct device *dev)
 {
        struct mei_cl_device *cldev = to_mei_cl_device(dev);
-       struct mei_cl_driver *cldrv;
-       int ret = 0;
+       struct mei_cl_driver *cldrv = to_mei_cl_driver(dev->driver);
 
-       if (!cldev || !dev->driver)
-               return 0;
-
-       cldrv = to_mei_cl_driver(dev->driver);
        if (cldrv->remove)
-               ret = cldrv->remove(cldev);
+               cldrv->remove(cldev);
 
        mei_cldev_unregister_callbacks(cldev);
 
        mei_cl_bus_module_put(cldev);
        module_put(THIS_MODULE);
 
-       return ret;
+       return 0;
 }
 
 static ssize_t name_show(struct device *dev, struct device_attribute *a,