From 454a480bac0094bb517fb5c8c62ab2046afc9076 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 13 Dec 2007 16:01:37 -0800
Subject: [PATCH] --- yaml --- r: 76896 b: refs/heads/master c:
 e6a73ab1c8e814ac7b0d69f44fde63299b639489 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3d73a7f01626..dcc50a728b64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce54d1616302117fa98513ae916bb3333e1c02ea
+refs/heads/master: e6a73ab1c8e814ac7b0d69f44fde63299b639489
diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c
index d7d5a5ae04ef..1bc1acf3bbbb 100644
--- a/trunk/drivers/ata/libata-eh.c
+++ b/trunk/drivers/ata/libata-eh.c
@@ -231,7 +231,8 @@ void ata_port_pbar_desc(struct ata_port *ap, int bar, ssize_t offset,
 	if (offset < 0)
 		ata_port_desc(ap, "%s %s%llu@0x%llx", name, type, len, start);
 	else
-		ata_port_desc(ap, "%s 0x%llx", name, start + offset);
+		ata_port_desc(ap, "%s 0x%llx", name,
+				start + (unsigned long long)offset);
 }
 
 #endif /* CONFIG_PCI */