]> git.hungrycats.org Git - linux/commitdiff
[PATCH] pdc202xx_old.c: fix enabling 66MHz clock for modes > UDMA2
authorBartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl>
Mon, 19 Jan 2004 13:44:02 +0000 (05:44 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Mon, 19 Jan 2004 13:44:02 +0000 (05:44 -0800)
drive->id is now always present even if no device is attached,
therefore check for drive->present instead.

drivers/ide/pci/pdc202xx_old.c

index 6281f7a093756704e1ae50b8bbc29e70e20c0fff..5eb9e66a782909a7a6e9109c162bfd2a0fa93a8e 100644 (file)
@@ -424,10 +424,10 @@ static int config_chipset_for_dma (ide_drive_t *drive)
        } else {
                if (ultra_66) {
                        /*
-                        * check to make sure drive on same channel
-                        * is u66 capable
+                        * Check to make sure drive on the same channel
+                        * is UDMA3 or higher capable.  Ignore empty slots.
                         */
-                       if (hwif->drives[!(drive->dn%2)].id) {
+                       if (hwif->drives[!(drive->dn%2)].present) {
                                if (hwif->drives[!(drive->dn%2)].id->dma_ultra & 0x0078) {
                                        hwif->OUTB(CLKSPD | mask, (hwif->dma_master + 0x11));
                                } else {