diff options
author | James Bottomley <JBottomley@Odin.com> | 2015-11-12 07:06:18 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Odin.com> | 2015-11-12 07:06:18 -0500 |
commit | febdfbd2137a5727f70dfbf920105c07e6c2a21e (patch) | |
tree | 9483a5493ad3e08626e1f53ded594f88a6f4e710 /drivers/message | |
parent | 0da39687a15403251bdfd1c6fb18025c0607326b (diff) | |
parent | 2c5d16d6a9e7218e57b716e4fd9d77c776d21471 (diff) |
Merge tag '4.4-scsi-mkp' into misc
SCSI queue for 4.4.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/fusion/mptctl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index fc7393729081..02b5f69e1a42 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
@@ -1038,6 +1038,10 @@ kbuf_alloc_2_sgl(int bytes, u32 sgdir, int sge_offset, int *frags, | |||
1038 | int i, buflist_ent; | 1038 | int i, buflist_ent; |
1039 | int sg_spill = MAX_FRAGS_SPILL1; | 1039 | int sg_spill = MAX_FRAGS_SPILL1; |
1040 | int dir; | 1040 | int dir; |
1041 | |||
1042 | if (bytes < 0) | ||
1043 | return NULL; | ||
1044 | |||
1041 | /* initialization */ | 1045 | /* initialization */ |
1042 | *frags = 0; | 1046 | *frags = 0; |
1043 | *blp = NULL; | 1047 | *blp = NULL; |