projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
00b6f5e
63af2a5
)
Merge branch 'mv-merge'
author
Jeff Garzik
<jeff@garzik.org>
Thu, 30 Mar 2006 00:43:31 +0000
(19:43 -0500)
committer
Jeff Garzik
<jeff@garzik.org>
Thu, 30 Mar 2006 00:43:31 +0000
(19:43 -0500)
Conflicts:
drivers/scsi/sata_mv.c
1
2
drivers/scsi/sata_mv.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/scsi/sata_mv.c
index
275ed9b
,
33e3873
..
fa901fd
---
1
/
drivers/scsi/sata_mv.c
---
2
/
drivers/scsi/sata_mv.c
+++ b/
drivers/scsi/sata_mv.c
@@@
-1372,8
-1209,8
+1371,10
@@@
static void mv_host_intr(struct ata_hos
hc,relevant,hc_irq_cause);
for (port = port0; port < port0 + MV_PORTS_PER_HC; port++) {
- ap = host_set->ports[port];
+ u8 ata_status = 0;
+ struct ata_port *ap = host_set->ports[port];
+ struct mv_port_priv *pp = ap->private_data;
++
hard_port = port & MV_PORT_MASK; /* range 0-3 */
handled = 0; /* ensure ata_status is set if handled++ */