Merge branch 'eisa' into next

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

Merge branch 'eisa' into next
* eisa: EISA: Call put_device() if device_register() fails
e338e49d · Bjorn Helgaas · 1d72e71d · 04df008a · e338e49d
Commit e338e49d authored Dec 18, 2013 by Bjorn Helgaas
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

drivers/eisa/eisa-bus.c drivers/eisa/eisa-bus.c +3 -1

No files found.
--- 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)