aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Kibardin <george-kibardin@yandex.ru>2008-01-10 23:03:42 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-10 23:03:42 +0100
commitb98f8803ccfe9d156d37a6eb471a620904085c80 (patch)
tree13f2b3ca326f38e9e108f7bbc4888b86343a85dd
parentide: workaround suspend bug for ACPI IDE (diff)
downloadlinux-dev-b98f8803ccfe9d156d37a6eb471a620904085c80.tar.xz
linux-dev-b98f8803ccfe9d156d37a6eb471a620904085c80.zip
ide: fix cable detection for SATA bridges
Signed-off-by: George Kibardin <george-kibardin@yandex.ru> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-iops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index cef405ddaf0e..bb9693dabe41 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -612,12 +612,12 @@ u8 eighty_ninty_three (ide_drive_t *drive)
printk(KERN_DEBUG "%s: skipping word 93 validity check\n",
drive->name);
+ if (ide_dev_is_sata(id) && !ivb)
+ return 1;
+
if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
goto no_80w;
- if (ide_dev_is_sata(id))
- return 1;
-
/*
* FIXME:
* - force bit13 (80c cable present) check also for !ivb devices