projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[WATCHDOG] iTCO_wdt.c shutdown patch
[powerpc.git]
/
drivers
/
scsi
/
qlogicpti.c
diff --git
a/drivers/scsi/qlogicpti.c
b/drivers/scsi/qlogicpti.c
index
329ead2
..
5b2f074
100644
(file)
--- a/
drivers/scsi/qlogicpti.c
+++ b/
drivers/scsi/qlogicpti.c
@@
-718,7
+718,7
@@
static int __init qpti_register_irq(struct qlogicpti *qpti)
* sanely maintain.
*/
if (request_irq(qpti->irq, qpti_intr,
* sanely maintain.
*/
if (request_irq(qpti->irq, qpti_intr,
-
SA_SHIRQ
, "Qlogic/PTI", qpti))
+
IRQF_SHARED
, "Qlogic/PTI", qpti))
goto fail;
printk("qpti%d: IRQ %d ", qpti->qpti_id, qpti->irq);
goto fail;
printk("qpti%d: IRQ %d ", qpti->qpti_id, qpti->irq);
@@
-874,7
+874,7
@@
static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd,
if (Cmnd->use_sg) {
int sg_count;
if (Cmnd->use_sg) {
int sg_count;
- sg = (struct scatterlist *) Cmnd->buffer;
+ sg = (struct scatterlist *) Cmnd->
request_
buffer;
sg_count = sbus_map_sg(qpti->sdev, sg, Cmnd->use_sg, Cmnd->sc_data_direction);
ds = cmd->dataseg;
sg_count = sbus_map_sg(qpti->sdev, sg, Cmnd->use_sg, Cmnd->sc_data_direction);
ds = cmd->dataseg;
@@
-1278,7
+1278,7
@@
static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)
if (Cmnd->use_sg) {
sbus_unmap_sg(qpti->sdev,
if (Cmnd->use_sg) {
sbus_unmap_sg(qpti->sdev,
- (struct scatterlist *)Cmnd->buffer,
+ (struct scatterlist *)Cmnd->
request_
buffer,
Cmnd->use_sg,
Cmnd->sc_data_direction);
} else {
Cmnd->use_sg,
Cmnd->sc_data_direction);
} else {