diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
| commit | 3c06da5ae5358e9d325d541a053e1059e9654bcc (patch) | |
| tree | 04c953cc82fe57cff248ac523095cd4f0d9611a7 /drivers/scsi/megaraid/megaraid_mm.c | |
| parent | 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 (diff) | |
| parent | a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_mm.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_mm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c index 8f3ce0432295..e8f534fb336b 100644 --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c | |||
| @@ -898,10 +898,8 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp) | |||
| 898 | 898 | ||
| 899 | adapter = kmalloc(sizeof(mraid_mmadp_t), GFP_KERNEL); | 899 | adapter = kmalloc(sizeof(mraid_mmadp_t), GFP_KERNEL); |
| 900 | 900 | ||
| 901 | if (!adapter) { | 901 | if (!adapter) |
| 902 | rval = -ENOMEM; | 902 | return -ENOMEM; |
| 903 | goto memalloc_error; | ||
| 904 | } | ||
| 905 | 903 | ||
| 906 | memset(adapter, 0, sizeof(mraid_mmadp_t)); | 904 | memset(adapter, 0, sizeof(mraid_mmadp_t)); |
| 907 | 905 | ||