Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of git://git...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / ps3rom.c

diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c
index b3b48b5a984c54021e45aa5056efdf58500e2617..5298def3373339bb3e0b917b756447395c9692bf 100644 (file)
--- a/drivers/scsi/ps3rom.c
+++ b/drivers/scsi/ps3rom.c
@@ -383,6 +383,7 @@ static int ps3rom_probe(struct ps3_system_bus_device *_dev)
        if (!host) {
                dev_err(&dev->sbd.core, "%s:%u: scsi_host_alloc failed\n",
                        __func__, __LINE__);
+               error = -ENOMEM;
                goto fail_teardown;
        }