3 files changed, 15 insertions, 10 deletions

diff --git a/drivers/misc/dummy-irq.c b/drivers/misc/dummy-irq.c
index 7014167e2c61..c37eeedfe215 100644
--- a/drivers/misc/dummy-irq.c
+++ b/drivers/misc/dummy-irq.c
@@ -19,7 +19,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 
-static int irq;
+static int irq = -1;
 
 static irqreturn_t dummy_interrupt(int irq, void *dev_id)
 {
@@ -36,6 +36,10 @@ static irqreturn_t dummy_interrupt(int irq, void *dev_id)
 
 static int __init dummy_irq_init(void)
 {
+        if (irq < 0) {
+                printk(KERN_ERR "dummy-irq: no IRQ given.  Use irq=N\n");
+                return -EIO;
+        }
         if (request_irq(irq, &dummy_interrupt, IRQF_SHARED, "dummy_irq", &irq)) {
                 printk(KERN_ERR "dummy-irq: cannot register IRQ %d\n", irq);
                 return -EIO;
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 1e935eacaa7f..9ecd49a7be1b 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -496,6 +496,8 @@ int mei_cl_disable_device(struct mei_cl_device *device)
                 }
         }
 
+        device->event_cb = NULL;
+
         mutex_unlock(&dev->device_lock);
 
         if (!device->ops || !device->ops->disable)
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 7c44c8dbae42..053139f61086 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -489,11 +489,16 @@ static int mei_ioctl_connect_client(struct file *file,
 
         /* find ME client we're trying to connect to */
         i = mei_me_cl_by_uuid(dev, &data->in_client_uuid);
-        if (i >= 0 && !dev->me_clients[i].props.fixed_address) {
-                cl->me_client_id = dev->me_clients[i].client_id;
-                cl->state = MEI_FILE_CONNECTING;
+        if (i < 0 || dev->me_clients[i].props.fixed_address) {
+                dev_dbg(&dev->pdev->dev, "Cannot connect to FW Client UUID = %pUl\n",
+                                &data->in_client_uuid);
+                rets = -ENODEV;
+                goto end;
         }
 
+        cl->me_client_id = dev->me_clients[i].client_id;
+        cl->state = MEI_FILE_CONNECTING;
+
         dev_dbg(&dev->pdev->dev, "Connect to FW Client ID = %d\n",
                         cl->me_client_id);
         dev_dbg(&dev->pdev->dev, "FW Client - Protocol Version = %d\n",
@@ -527,11 +532,6 @@ static int mei_ioctl_connect_client(struct file *file,
                 goto end;
         }
 
-        if (cl->state != MEI_FILE_CONNECTING) {
-                rets = -ENODEV;
-                goto end;
-        }
-
 
         /* prepare the output buffer */
         client = &data->out_client_properties;
@@ -543,7 +543,6 @@ static int mei_ioctl_connect_client(struct file *file,
         rets = mei_cl_connect(cl, file);
 
 end:
-        dev_dbg(&dev->pdev->dev, "free connect cb memory.");
         return rets;
 }