From 625076c76cd47cc7de34d7628f15f30142e126d9 Mon Sep 17 00:00:00 2001
From: Roland Dreier <rdreier@cisco.com>
Date: Tue, 4 Nov 2008 10:34:48 -0800
Subject: [PATCH] --- yaml --- r: 118671 b: refs/heads/master c:
 44901a96847b9967c057832b185e2f34ee6a14e5 h: refs/heads/master i:   118669:
 1664d2cd213205db73e9aa06693e906dc03c1686   118667:
 e99beabaa1c5432e4d6a3c06f3db5f50cd396374   118663:
 29cf423ae0d7226b5bf717d982d02876f27b51c6   118655:
 25661028c5d3e77f3ab1cb97ab27186b50403665 v: v3

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

diff --git a/[refs] b/[refs]
index e9568828a93a..1ef65273ead5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a12d6c9a09c644cb4a35be099eb5124d38e4feb8
+refs/heads/master: 44901a96847b9967c057832b185e2f34ee6a14e5
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index 0cd3ad497136..4214bfb13bbd 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -612,7 +612,7 @@ u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev)
 		if (tf->flags & ATA_TFLAG_LBA48) {
 			block |= (u64)tf->hob_lbah << 40;
 			block |= (u64)tf->hob_lbam << 32;
-			block |= tf->hob_lbal << 24;
+			block |= (u64)tf->hob_lbal << 24;
 		} else
 			block |= (tf->device & 0xf) << 24;