diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2011-10-13 00:28:54 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-13 17:04:50 -0400 |
| commit | 0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92 (patch) | |
| tree | 876459554ff66e9c1e30bb9f1ac34b1e32fc68d2 | |
| parent | acc8dbe7f44f1bab6fcf21f2d5efb32ea92e19fd (diff) | |
| download | linux-3.10-0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92.tar.gz linux-3.10-0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92.tar.bz2 linux-3.10-0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92.zip | |
cy82c693: fix PCI device selection
Wrong PCI device may be selected by cy82c693_set_pio_mode() if modular
IDE host drivers are used and there are additional IDE PCI devices
installed in the system. Fix it.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/ide/cy82c693.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c index 67cbcfa3512..847553fd8b9 100644 --- a/drivers/ide/cy82c693.c +++ b/drivers/ide/cy82c693.c @@ -1,7 +1,7 @@ /* * Copyright (C) 1998-2000 Andreas S. Krebs (akrebs@altavista.net), Maintainer * Copyright (C) 1998-2002 Andre Hedrick <andre@linux-ide.org>, Integrator - * Copyright (C) 2007-2010 Bartlomiej Zolnierkiewicz + * Copyright (C) 2007-2011 Bartlomiej Zolnierkiewicz * * CYPRESS CY82C693 chipset IDE controller * @@ -90,7 +90,7 @@ static void cy82c693_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) u8 time_16, time_8; /* select primary or secondary channel */ - if (hwif->index > 0) { /* drive is on the secondary channel */ + if (drive->dn > 1) { /* drive is on the secondary channel */ dev = pci_get_slot(dev->bus, dev->devfn+1); if (!dev) { printk(KERN_ERR "%s: tune_drive: " @@ -141,7 +141,7 @@ static void cy82c693_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) pci_write_config_byte(dev, CY82_IDE_SLAVE_IOW, time_16); pci_write_config_byte(dev, CY82_IDE_SLAVE_8BIT, time_8); } - if (hwif->index > 0) + if (drive->dn > 1) pci_dev_put(dev); } |