IB/hfi1: Change hfi1_init loop to preserve error returns

If one iteration of the loop causes an error return and a later iteration
doesn't, the later iteration causes the earlier error condition to be
lost. This could result in driver probe succeeding when it should have
failed. Therefore save off the error return in the loop itself rather than
outside the loop.

Reviewed-by: Dennis Dalessandro <[email protected]>
Reviewed-by: Mitko Haralanov <[email protected]>
Signed-off-by: Ashutosh Dixit <[email protected]>
Signed-off-by: Doug Ledford <[email protected]>

diff --git a/drivers/staging/rdma/hfi1/init.c b/drivers/staging/rdma/hfi1/init.c
index 502b7cf4647de3afa23bf15f2636d267d35a48da..9e71abf0f40f753c8a94b1174ac5e4bfde277b3b 100644 (file)
--- a/drivers/staging/rdma/hfi1/init.c
+++ b/drivers/staging/rdma/hfi1/init.c
@@ -732,12 +732,12 @@ int hfi1_init(struct hfi1_devdata *dd, int reinit)
                lastfail = hfi1_create_rcvhdrq(dd, rcd);
                if (!lastfail)
                        lastfail = hfi1_setup_eagerbufs(rcd);
-               if (lastfail)
+               if (lastfail) {
                        dd_dev_err(dd,
                                   "failed to allocate kernel ctxt's rcvhdrq and/or egr bufs\n");
+                       ret = lastfail;
+               }
        }
-       if (lastfail)
-               ret = lastfail;
 
        /* Allocate enough memory for user event notification. */
        len = PAGE_ALIGN(dd->chip_rcv_contexts * HFI1_MAX_SHARED_CTXTS *