Merge branch 'eisa' into next

* eisa:
  EISA: Call put_device() if device_register() fails

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c
index 272a3ec35957..8842cde69177 100644
--- a/drivers/eisa/eisa-bus.c
+++ b/drivers/eisa/eisa-bus.c
@@ -232,8 +232,10 @@ static int __init eisa_init_device(struct eisa_root_device *root,
 static int __init eisa_register_device(struct eisa_device *edev)
 {
         int rc = device_register(&edev->dev);
-        if (rc)
+        if (rc) {
+                put_device(&edev->dev);
                 return rc;
+        }
 
         rc = device_create_file(&edev->dev, &dev_attr_signature);
         if (rc)