---

yaml
---
r: 61959
b: refs/heads/master
c: 2fe8c3f
h: refs/heads/master
i:
  61957: 42007f1
  61955: ed0aae2
  61951: b28b183
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64771a0f19320f73ab4be69db591ba51a17d7748
+refs/heads/master: 2fe8c3f1538e8db2b853f10480584679b0c336f1

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)