From b5c1d22876096858d9523876a5e15e09387d5f03 Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segooon@gmail.com>
Date: Sun, 19 Sep 2010 16:55:21 +0400
Subject: [PATCH] --- yaml --- r: 213297 b: refs/heads/master c:
 10b68799b32d60ff578742d0deebc98afff30dba h: refs/heads/master i:   213295:
 b8d6348089c4846e1ef47af8fe013616e0d874bf v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/zorro/zorro.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 526cbbbd91f3..ebbeb337cd5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c37dd7c41b7391698bbe354b81fe9909c281984
+refs/heads/master: 10b68799b32d60ff578742d0deebc98afff30dba
diff --git a/trunk/drivers/zorro/zorro.c b/trunk/drivers/zorro/zorro.c
index 6455f3a244c5..e0c2807b0970 100644
--- a/trunk/drivers/zorro/zorro.c
+++ b/trunk/drivers/zorro/zorro.c
@@ -142,6 +142,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
 	error = device_register(&bus->dev);
 	if (error) {
 		pr_err("Zorro: Error registering zorro_bus\n");
+		put_device(&bus->dev);
 		kfree(bus);
 		return error;
 	}
@@ -175,6 +176,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
 		if (error) {
 			dev_err(&bus->dev, "Error registering device %s\n",
 				z->name);
+			put_device(&z->dev);
 			continue;
 		}
 		error = zorro_create_sysfs_dev_files(z);