diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /drivers/message/fusion/mptbase.c | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'drivers/message/fusion/mptbase.c')
| -rw-r--r-- | drivers/message/fusion/mptbase.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 6837a8ef9371..3e57b61ca446 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
| @@ -5945,8 +5945,10 @@ mpt_findImVolumes(MPT_ADAPTER *ioc) | |||
| 5945 | goto out; | 5945 | goto out; |
| 5946 | 5946 | ||
| 5947 | mem = kmalloc(iocpage2sz, GFP_KERNEL); | 5947 | mem = kmalloc(iocpage2sz, GFP_KERNEL); |
| 5948 | if (!mem) | 5948 | if (!mem) { |
| 5949 | rc = -ENOMEM; | ||
| 5949 | goto out; | 5950 | goto out; |
| 5951 | } | ||
| 5950 | 5952 | ||
| 5951 | memcpy(mem, (u8 *)pIoc2, iocpage2sz); | 5953 | memcpy(mem, (u8 *)pIoc2, iocpage2sz); |
| 5952 | ioc->raid_data.pIocPg2 = (IOCPage2_t *) mem; | 5954 | ioc->raid_data.pIocPg2 = (IOCPage2_t *) mem; |