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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
scsi
/
megaraid.c
diff --git
a/drivers/scsi/megaraid.c
b/drivers/scsi/megaraid.c
index
76edbb6
..
de35ffe
100644
(file)
--- a/
drivers/scsi/megaraid.c
+++ b/
drivers/scsi/megaraid.c
@@
-524,7
+524,7
@@
mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)
* filter the internal and ioctl commands
*/
if((cmd->cmnd[0] == MEGA_INTERNAL_CMD)) {
* filter the internal and ioctl commands
*/
if((cmd->cmnd[0] == MEGA_INTERNAL_CMD)) {
- return cmd->
request_
buffer;
+ return cmd->buffer;
}
}
@@
-1828,7
+1828,7
@@
mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)
scb->dma_type = MEGA_SGLIST;
scb->dma_type = MEGA_SGLIST;
-
BUG_ON(sgcnt > adapter->sglen
);
+
if( sgcnt > adapter->sglen ) BUG(
);
*len = 0;
*len = 0;
@@
-4492,7
+4492,7
@@
mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru)
scmd->device = sdev;
scmd->device->host = adapter->host;
scmd->device = sdev;
scmd->device->host = adapter->host;
- scmd->
request_
buffer = (void *)scb;
+ scmd->buffer = (void *)scb;
scmd->cmnd[0] = MEGA_INTERNAL_CMD;
scb->state |= SCB_ACTIVE;
scmd->cmnd[0] = MEGA_INTERNAL_CMD;
scb->state |= SCB_ACTIVE;
@@
-4714,7
+4714,7
@@
megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
if (request_irq(irq, (adapter->flag & BOARD_MEMMAP) ?
megaraid_isr_memmapped : megaraid_isr_iomapped,
if (request_irq(irq, (adapter->flag & BOARD_MEMMAP) ?
megaraid_isr_memmapped : megaraid_isr_iomapped,
-
IRQF_SHARED
, "megaraid", adapter)) {
+
SA_SHIRQ
, "megaraid", adapter)) {
printk(KERN_WARNING
"megaraid: Couldn't register IRQ %d!\n", irq);
goto out_free_scb_list;
printk(KERN_WARNING
"megaraid: Couldn't register IRQ %d!\n", irq);
goto out_free_scb_list;