From d29ae95718076df8ae0118fb59c25ce273ef8be4 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 18 Jul 2007 10:58:02 -0700
Subject: [PATCH] --- yaml --- r: 61959 b: refs/heads/master c:
 2fe8c3f1538e8db2b853f10480584679b0c336f1 h: refs/heads/master i:   61957:
 42007f1e222f223b5f121ec7709a8be5533c8183   61955:
 ed0aae2c6dcfe8222b70c3eeba1acda355365435   61951:
 b28b183d31ad35134993139f147a926cd3d775fb v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/usb/misc/phidgetkit.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index edb00586c120..493973b9c6f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64771a0f19320f73ab4be69db591ba51a17d7748
+refs/heads/master: 2fe8c3f1538e8db2b853f10480584679b0c336f1
diff --git a/trunk/drivers/usb/misc/phidgetkit.c b/trunk/drivers/usb/misc/phidgetkit.c
index 371bf2b1197d..aa9bcceabe74 100644
--- a/trunk/drivers/usb/misc/phidgetkit.c
+++ b/trunk/drivers/usb/misc/phidgetkit.c
@@ -305,9 +305,10 @@ static void interfacekit_irq(struct urb *urb)
 	struct interfacekit *kit = urb->context;
 	unsigned char *buffer = kit->data;
 	int i, level, sensor;
-	int status;
+	int retval;
+	int status = urb->status;
 
-	switch (urb->status) {
+	switch (status) {
 	case 0:			/* success */
 		break;
 	case -ECONNRESET:	/* unlink */
@@ -377,11 +378,11 @@ static void interfacekit_irq(struct urb *urb)
 		schedule_delayed_work(&kit->do_notify, 0);
 
 resubmit:
-	status = usb_submit_urb(urb, GFP_ATOMIC);
-	if (status)
-		err("can't resubmit intr, %s-%s/interfacekit0, status %d",
+	retval = usb_submit_urb(urb, GFP_ATOMIC);
+	if (retval)
+		err("can't resubmit intr, %s-%s/interfacekit0, retval %d",
 			kit->udev->bus->bus_name,
-			kit->udev->devpath, status);
+			kit->udev->devpath, retval);
 }
 
 static void do_notify(struct work_struct *work)