diff options
Diffstat (limited to 'drivers/zorro')
-rw-r--r-- | drivers/zorro/proc.c | 1 | ||||
-rw-r--r-- | drivers/zorro/zorro.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c index cafc50454292..e0c84725d3e9 100644 --- a/drivers/zorro/proc.c +++ b/drivers/zorro/proc.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
14 | #include <linux/seq_file.h> | 14 | #include <linux/seq_file.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/smp_lock.h> | ||
17 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
18 | #include <asm/amigahw.h> | 17 | #include <asm/amigahw.h> |
19 | #include <asm/setup.h> | 18 | #include <asm/setup.h> |
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index 6455f3a244c5..e0c2807b0970 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c | |||
@@ -142,6 +142,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev) | |||
142 | error = device_register(&bus->dev); | 142 | error = device_register(&bus->dev); |
143 | if (error) { | 143 | if (error) { |
144 | pr_err("Zorro: Error registering zorro_bus\n"); | 144 | pr_err("Zorro: Error registering zorro_bus\n"); |
145 | put_device(&bus->dev); | ||
145 | kfree(bus); | 146 | kfree(bus); |
146 | return error; | 147 | return error; |
147 | } | 148 | } |
@@ -175,6 +176,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev) | |||
175 | if (error) { | 176 | if (error) { |
176 | dev_err(&bus->dev, "Error registering device %s\n", | 177 | dev_err(&bus->dev, "Error registering device %s\n", |
177 | z->name); | 178 | z->name); |
179 | put_device(&z->dev); | ||
178 | continue; | 180 | continue; |
179 | } | 181 | } |
180 | error = zorro_create_sysfs_dev_files(z); | 182 | error = zorro_create_sysfs_dev_files(z); |