git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
scsi
/
megaraid
/
megaraid_mm.c
diff --git
a/drivers/scsi/megaraid/megaraid_mm.c
b/drivers/scsi/megaraid/megaraid_mm.c
index
8f3ce04
..
d85b9a8
100644
(file)
--- a/
drivers/scsi/megaraid/megaraid_mm.c
+++ b/
drivers/scsi/megaraid/megaraid_mm.c
@@
-10,7
+10,7
@@
* 2 of the License, or (at your option) any later version.
*
* FILE : megaraid_mm.c
* 2 of the License, or (at your option) any later version.
*
* FILE : megaraid_mm.c
- * Version : v2.20.2.
6 (Mar 7 2005
)
+ * Version : v2.20.2.
7 (Jul 16 2006
)
*
* Common management module
*/
*
* Common management module
*/
@@
-898,10
+898,8
@@
mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
adapter = kmalloc(sizeof(mraid_mmadp_t), GFP_KERNEL);
adapter = kmalloc(sizeof(mraid_mmadp_t), GFP_KERNEL);
- if (!adapter) {
- rval = -ENOMEM;
- goto memalloc_error;
- }
+ if (!adapter)
+ return -ENOMEM;
memset(adapter, 0, sizeof(mraid_mmadp_t));
memset(adapter, 0, sizeof(mraid_mmadp_t));