diff --git a/[refs] b/[refs]
index 4301fd64671e..28922fd164f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9184a22701ed257974e7950be11da4cbd3116c63
+refs/heads/master: 6975f4ce5a44e337514283e84761adaf2849aa26
diff --git a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c
index 8da3e41058ca..df09b1cb742f 100644
--- a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -2836,7 +2836,7 @@ static int ql_create_send_free_list(struct ql3_adapter *qdev)
 		req_q_curr++;
 		tx_cb->oal = kmalloc(512, GFP_KERNEL);
 		if (tx_cb->oal == NULL)
-			return -1;
+			return -ENOMEM;
 	}
 	return 0;
 }