diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/hp/sim/simscsi.c | 9 | ||||
| -rw-r--r-- | arch/powerpc/platforms/ps3/system-bus.c | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c index 4552a1cf5b3..d62fa76e5a7 100644 --- a/arch/ia64/hp/sim/simscsi.c +++ b/arch/ia64/hp/sim/simscsi.c @@ -372,8 +372,13 @@ simscsi_init(void) return -ENOMEM; error = scsi_add_host(host, NULL); - if (!error) - scsi_scan_host(host); + if (error) + goto free_host; + scsi_scan_host(host); + return 0; + + free_host: + scsi_host_put(host); return error; } diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c index ea0b2c79041..190ff4b59a5 100644 --- a/arch/powerpc/platforms/ps3/system-bus.c +++ b/arch/powerpc/platforms/ps3/system-bus.c @@ -440,7 +440,6 @@ static void ps3_system_bus_shutdown(struct device *_dev) static int ps3_system_bus_uevent(struct device *_dev, struct kobj_uevent_env *env) { struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev); - int i = 0, length = 0; if (add_uevent_var(env, "MODALIAS=ps3:%d", dev->match_id)) return -ENOMEM; |