2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 96fe2f956754..ab53832d57e5 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -180,7 +180,9 @@ static ssize_t driver_bind(struct device_driver *drv,
                 up(&dev->sem);
                 put_device(dev);
         }
-        return err;
+        if (err)
+                return err;
+        return count;
 }
 static DRIVER_ATTR(bind, S_IWUSR, NULL, driver_bind);
 
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index add12f7c489a..6e5229e92fbc 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -312,6 +312,8 @@ found:
         if (drv->link.driver.probe) {
                 if (drv->link.driver.probe(&dev->dev)) {
                         dev->dev.driver = NULL;
+                        dev->card_link = NULL;
+                        up_write(&dev->dev.bus->subsys.rwsem);
                         return NULL;
                 }
         }