From 5f636489e42e249c2b9ad90aada66ec6f3ca00ee Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Fri, 21 Sep 2007 20:07:14 +0900
Subject: [PATCH] --- yaml --- r: 68123 b: refs/heads/master c:
 1e582ba4ef6264dd8cb73250ebff767d0624d684 h: refs/heads/master i:   68121:
 8b009cc398bd89f0c9b22a9358112de64b0ab47e   68119:
 25a51c0649464fb4b966035019ad106ae5934cbf v: v3

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

diff --git a/[refs] b/[refs]
index 2818dfc97d8c..a8c4f5f39ea5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d77b247088fb360aa74bfdd9e19bce1e1987668
+refs/heads/master: 1e582ba4ef6264dd8cb73250ebff767d0624d684
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index 8b08e7bdd24d..fd4563daacd1 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -950,9 +950,12 @@ static int ata_set_max_sectors(struct ata_device *dev, u64 new_sectors)
 		tf.hob_lbal = (new_sectors >> 24) & 0xff;
 		tf.hob_lbam = (new_sectors >> 32) & 0xff;
 		tf.hob_lbah = (new_sectors >> 40) & 0xff;
-	} else
+	} else {
 		tf.command = ATA_CMD_SET_MAX;
 
+		tf.device |= (new_sectors >> 24) & 0xf;
+	}
+
 	tf.protocol |= ATA_PROT_NODATA;
 	tf.device |= ATA_LBA;