libata-sff: use our IRQ defines
PATCH 1/1 libata-sff: use our IRQ defines
drivers/ata/libata-sff.c +2 -2
@@ -881,7 +881,7 @@ probe_ent->private_data = port[0 ]->private_data;if (port_mask &ATA_PORT_PRIMARY ) { - probe_ent->irq =14 ; + probe_ent->irq =ATA_PRIMARY_IRQ ; probe_ent->port[0 ].cmd_addr =ATA_PRIMARY_CMD ; probe_ent->port[0 ].altstatus_addr = probe_ent->port[0 ].ctl_addr =ATA_PRIMARY_CTL ;
@@ -896,7 +896,7 @@if (port_mask &ATA_PORT_SECONDARY ) {if (probe_ent->irq) - probe_ent->irq2 =15 ; + probe_ent->irq2 =ATA_SECONDARY_IRQ ;else probe_ent->irq =15 ; probe_ent->port[1 ].cmd_addr =ATA_SECONDARY_CMD ;
Jeff Garzik
AppliedQuoted 1 line · Alan Cox
Signed-off-by Alan Cox <[email protected]>
applied
Quoted 15 lines · Alan Cox
Signed-off-by Alan Cox <[email protected]>diff -u --new-file --recursive --exclude-from
/usr/src/excludelinux.vanilla-2.6.18-mm1/drivers/ata/libata-sff.clinux-2.6.18-mm1/drivers/ata/libata-sff.cdrivers/ata/libata-sff.c +1
-1@@ -881,7 +881,7 @@ probe_ent->private_data = port[0 ]->private_data;if (port_mask &ATA_PORT_PRIMARY ) { - probe_ent->irq =14 ; + probe_ent->irq =ATA_PRIMARY_IRQ ; probe_ent->port[0 ].cmd_addr =ATA_PRIMARY_CMD ; probe_ent->port[0 ].altstatus_addr = probe_ent->port[0 ].ctl_addr =ATA_PRIMARY_CTL ;
drivers/ata/libata-sff.c line 901
Quoted 7 lines
drivers/ata/libata-sff.c +1
-1@@ -896,7 +896,7 @@if (port_mask &ATA_PORT_SECONDARY ) {if (probe_ent->irq) - probe_ent->irq2 =15 ; + probe_ent->irq2 =ATA_SECONDARY_IRQ ;else probe_ent->irq =15 ;
Isn't that one supposed to be ATA_SECONDARY_IRQ too?
drivers/ata/libata-sff.c line 902
Quoted 2 lines
drivers/ata/libata-sff.c +0
-0probe_ent->port[1 ].cmd_addr =ATA_SECONDARY_CMD ;
OG.
Ar Maw, 2006-09-26 am 22:44 +0200, ysgrifennodd Olivier Galibert:
Quoted 9 lines
drivers/ata/libata-sff.c line 901
Quoted 5 lines
drivers/ata/libata-sff.c +1
-1if (probe_ent->irq) - probe_ent->irq2 =15 ; + probe_ent->irq2 =ATA_SECONDARY_IRQ ;else probe_ent->irq =15 ;Isn't that one supposed to be
ATA_SECONDARY_IRQtoo?Quoted 1 line
probe_ent->port[1].cmd_addr =
ATA_SECONDARY_CMD;
Duh yes...
(adds another paper bag to the pile)
Quoted 8 lines · Alan Cox
Ar Maw, 2006-09-26 am 22:44 +0200, ysgrifennodd Olivier Galibert:
Quoted 7 lines
drivers/ata/libata-sff.c line 901
Quoted 5 lines
drivers/ata/libata-sff.c +1
-1if (probe_ent->irq) - probe_ent->irq2 =15 ; + probe_ent->irq2 =ATA_SECONDARY_IRQ ;else probe_ent->irq =15 ;Isn't that one supposed to be
ATA_SECONDARY_IRQtoo?
Quoted 5 lines
Quoted 1 line
Quoted 1 line
probe_ent->port[1].cmd_addr =
ATA_SECONDARY_CMD;Duh yes...
(adds another paper bag to the pile)
committed obvious fix...