diff options
| author | Alan <alan@lxorguk.ukuu.org.uk> | 2007-01-24 12:47:07 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-25 01:55:16 +0100 |
| commit | b229a7b0aed808f2ef6a5e9dbf78b0f17cefb4d0 (patch) | |
| tree | 2333566c51f5eabc6c1a638155d8efaa6ebd64b5 /drivers/ata/ata_generic.c | |
| parent | libata hpt3xn: Hopefully sort out the DPLL logic versus the vendor code (diff) | |
| download | linux-b229a7b0aed808f2ef6a5e9dbf78b0f17cefb4d0.tar.xz linux-b229a7b0aed808f2ef6a5e9dbf78b0f17cefb4d0.zip | |
libata: set_mode, Fix the FIXME
When set_mode() changed ->set_mode didn't adapt. This makes the needed
changes and removes the relevant FIXME case.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/ata_generic.c')
| -rw-r--r-- | drivers/ata/ata_generic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 908751d27e76..24af56081b5d 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c @@ -64,6 +64,7 @@ static void generic_error_handler(struct ata_port *ap) /** * generic_set_mode - mode setting * @ap: interface to set up + * @unused: returned device on error * * Use a non standard set_mode function. We don't want to be tuned. * The BIOS configured everything. Our job is not to fiddle. We @@ -71,7 +72,7 @@ static void generic_error_handler(struct ata_port *ap) * and respect them. */ -static void generic_set_mode(struct ata_port *ap) +static int generic_set_mode(struct ata_port *ap, struct ata_device **unused) { int dma_enabled = 0; int i; @@ -82,7 +83,7 @@ static void generic_set_mode(struct ata_port *ap) for (i = 0; i < ATA_MAX_DEVICES; i++) { struct ata_device *dev = &ap->device[i]; - if (ata_dev_enabled(dev)) { + if (ata_dev_ready(dev)) { /* We don't really care */ dev->pio_mode = XFER_PIO_0; dev->dma_mode = XFER_MW_DMA_0; @@ -99,6 +100,7 @@ static void generic_set_mode(struct ata_port *ap) } } } + return 0; } static struct scsi_host_template generic_sht = { |