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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
9f1b550
..
e8f534f
100644
(file)
--- a/
drivers/scsi/megaraid/megaraid_mm.c
+++ b/
drivers/scsi/megaraid/megaraid_mm.c
@@
-10,13
+10,12
@@
* 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.
5 (Jan 21
2005)
+ * Version : v2.20.2.
6 (Mar 7
2005)
*
* Common management module
*/
#include "megaraid_mm.h"
*
* Common management module
*/
#include "megaraid_mm.h"
-#include <linux/smp_lock.h>
// Entry points for char node driver
// Entry points for char node driver
@@
-61,7
+60,7
@@
EXPORT_SYMBOL(mraid_mm_unregister_adp);
EXPORT_SYMBOL(mraid_mm_adapter_app_handle);
static int majorno;
EXPORT_SYMBOL(mraid_mm_adapter_app_handle);
static int majorno;
-static uint32_t drvr_ver = 0x0220020
1
;
+static uint32_t drvr_ver = 0x0220020
6
;
static int adapters_count_g;
static struct list_head adapters_list_g;
static int adapters_count_g;
static struct list_head adapters_list_g;
@@
-899,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));
@@
-996,17
+993,13
@@
pthru_dma_pool_error:
memalloc_error:
memalloc_error:
- if (adapter->kioc_list)
- kfree(adapter->kioc_list);
-
- if (adapter->mbox_list)
- kfree(adapter->mbox_list);
+ kfree(adapter->kioc_list);
+ kfree(adapter->mbox_list);
if (adapter->pthru_dma_pool)
pci_pool_destroy(adapter->pthru_dma_pool);
if (adapter->pthru_dma_pool)
pci_pool_destroy(adapter->pthru_dma_pool);
- if (adapter)
- kfree(adapter);
+ kfree(adapter);
return rval;
}
return rval;
}
@@
-1158,7
+1151,6
@@
mraid_mm_free_adp_resources(mraid_mmadp_t *adp)
}
kfree(adp->kioc_list);
}
kfree(adp->kioc_list);
-
kfree(adp->mbox_list);
pci_pool_destroy(adp->pthru_dma_pool);
kfree(adp->mbox_list);
pci_pool_destroy(adp->pthru_dma_pool);
@@
-1231,9
+1223,9
@@
mraid_mm_compat_ioctl(struct file *filep, unsigned int cmd,
unsigned long arg)
{
int err;
unsigned long arg)
{
int err;
- lock_kernel();
+
err = mraid_mm_ioctl(NULL, filep, cmd, arg);
err = mraid_mm_ioctl(NULL, filep, cmd, arg);
- unlock_kernel();
+
return err;
}
#endif
return err;
}
#endif