Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / message / fusion / mptbase.c

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 6837a8ef93717be71cf4e09ffef6a2e0c3e7bae1..3e57b61ca4469bc615126cfd827d8a19037b604e 100644 (file)
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -5945,8 +5945,10 @@ mpt_findImVolumes(MPT_ADAPTER *ioc)
                goto out;
 
        mem = kmalloc(iocpage2sz, GFP_KERNEL);
-       if (!mem)
+       if (!mem) {
+               rc = -ENOMEM;
                goto out;
+       }
 
        memcpy(mem, (u8 *)pIoc2, iocpage2sz);
        ioc->raid_data.pIocPg2 = (IOCPage2_t *) mem;