git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[pandora-kernel.git]
/
drivers
/
zorro
/
zorro.c
diff --git
a/drivers/zorro/zorro.c
b/drivers/zorro/zorro.c
index
6455f3a
..
e0c2807
100644
(file)
--- a/
drivers/zorro/zorro.c
+++ b/
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");
error = device_register(&bus->dev);
if (error) {
pr_err("Zorro: Error registering zorro_bus\n");
+ put_device(&bus->dev);
kfree(bus);
return error;
}
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);
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);
continue;
}
error = zorro_create_sysfs_dev_files(z);