projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] pktcdvd: Fix the logic in the pkt_writable_track function
[cascardo/linux.git]
/
drivers
/
block
/
cciss.c
diff --git
a/drivers/block/cciss.c
b/drivers/block/cciss.c
index
e4e9f25
..
0d65394
100644
(file)
--- a/
drivers/block/cciss.c
+++ b/
drivers/block/cciss.c
@@
-2183,6
+2183,7
@@
static void cciss_softirq_done(struct request *rq)
{
CommandList_struct *cmd = rq->completion_data;
ctlr_info_t *h = hba[cmd->ctlr];
{
CommandList_struct *cmd = rq->completion_data;
ctlr_info_t *h = hba[cmd->ctlr];
+ unsigned long flags;
u64bit temp64;
int i, ddir;
u64bit temp64;
int i, ddir;
@@
-2205,10
+2206,10
@@
static void cciss_softirq_done(struct request *rq)
printk("Done with %p\n", rq);
#endif /* CCISS_DEBUG */
printk("Done with %p\n", rq);
#endif /* CCISS_DEBUG */
- spin_lock_irq
(&h->lock
);
+ spin_lock_irq
save(&h->lock, flags
);
end_that_request_last(rq, rq->errors);
cmd_free(h, cmd,1);
end_that_request_last(rq, rq->errors);
cmd_free(h, cmd,1);
- spin_unlock_irq
(&h->lock
);
+ spin_unlock_irq
restore(&h->lock, flags
);
}
/* checks the status of the job and calls complete buffers to mark all
}
/* checks the status of the job and calls complete buffers to mark all
@@
-3360,7
+3361,7
@@
static int __init cciss_init(void)
printk(KERN_INFO DRIVER_NAME "\n");
/* Register for our PCI devices */
printk(KERN_INFO DRIVER_NAME "\n");
/* Register for our PCI devices */
- return pci_
module_init
(&cciss_pci_driver);
+ return pci_
register_driver
(&cciss_pci_driver);
}
static void __exit cciss_cleanup(void)
}
static void __exit cciss_cleanup(void)