From bb72b85106ed96f157e8797294098f1c713e7599 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Sun, 12 Feb 2006 23:32:58 +0900
Subject: [PATCH] --- yaml --- r: 21847 b: refs/heads/master c:
 8eabd02c246b808e0e27c3ee9ea17d0349efb06d h: refs/heads/master i:   21845:
 ce61b0f9969c0d73cfbe2c6faf0b968e13b43fbe   21843:
 a83fcf58be0b92102883dd0836d6010f33a27622   21839:
 03e0b7bbfa84be86dd601b5b08d892cccdac2b10 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/scsi/libata-core.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7e8dcf6441d7..3b904d79bb6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61eb066affc02e16c548aef8b876c49c84113f40
+refs/heads/master: 8eabd02c246b808e0e27c3ee9ea17d0349efb06d
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index 21ae752cd95c..5e8a32052a1e 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -1121,9 +1121,10 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device)
 }
 
 
-static inline u8 ata_dev_knobble(const struct ata_port *ap)
+static inline u8 ata_dev_knobble(const struct ata_port *ap,
+				 struct ata_device *dev)
 {
-	return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(ap->device->id)));
+	return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id)));
 }
 
 /**
@@ -1137,9 +1138,9 @@ static inline u8 ata_dev_knobble(const struct ata_port *ap)
 void ata_dev_config(struct ata_port *ap, unsigned int i)
 {
 	/* limit bridge transfers to udma5, 200 sectors */
-	if (ata_dev_knobble(ap)) {
+	if (ata_dev_knobble(ap, &ap->device[i])) {
 		printk(KERN_INFO "ata%u(%u): applying bridge limits\n",
-			ap->id, ap->device->devno);
+		       ap->id, i);
 		ap->udma_mask &= ATA_UDMA5;
 		ap->host->max_sectors = ATA_MAX_SECTORS;
 		ap->host->hostt->max_sectors = ATA_MAX_SECTORS;