From 5338cfebaf008953c4fd7e5f6d51121ac4743889 Mon Sep 17 00:00:00 2001
From: Andre Haupt <andre@bitwigglers.org>
Date: Mon, 2 Feb 2009 14:45:11 -0800
Subject: [PATCH] --- yaml --- r: 134725 b: refs/heads/master c:
 34a55eda483e8177c9044f93fd2c9107f02bf1c7 h: refs/heads/master i:   134723:
 31e47ce14a7e3d93243791eb342827eae3ad6e68 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/bluetooth/bt3c_cs.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e813bc90aacf..478a7cd192bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd2efd03b49d56ae795c71335bc7358022514c32
+refs/heads/master: 34a55eda483e8177c9044f93fd2c9107f02bf1c7
diff --git a/trunk/drivers/bluetooth/bt3c_cs.c b/trunk/drivers/bluetooth/bt3c_cs.c
index ff195c230825..d58e22b9f06a 100644
--- a/trunk/drivers/bluetooth/bt3c_cs.c
+++ b/trunk/drivers/bluetooth/bt3c_cs.c
@@ -359,9 +359,9 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
 			BT_ERR("Very strange (stat=0x%04x)", stat);
 		} else if ((stat & 0xff) != 0xff) {
 			if (stat & 0x0020) {
-				int stat = bt3c_read(iobase, 0x7002) & 0x10;
+				int status = bt3c_read(iobase, 0x7002) & 0x10;
 				BT_INFO("%s: Antenna %s", info->hdev->name,
-							stat ? "out" : "in");
+							status ? "out" : "in");
 			}
 			if (stat & 0x0001)
 				bt3c_receive(info);