diff --git a/[refs] b/[refs]
index 94ab3d406e6f..8598fb38c7c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2011e9249a252e0655807fbe6841f6cfe6b6c197
+refs/heads/master: f54fa84dda211f68f65002efa44142207c886c79
diff --git a/trunk/drivers/usb/misc/usbtest.c b/trunk/drivers/usb/misc/usbtest.c
index 786e1dbe88ec..983e104dd452 100644
--- a/trunk/drivers/usb/misc/usbtest.c
+++ b/trunk/drivers/usb/misc/usbtest.c
@@ -1242,11 +1242,12 @@ static int halt_simple (struct usbtest_dev *dev)
 static int ctrl_out (struct usbtest_dev *dev,
 		unsigned count, unsigned length, unsigned vary)
 {
-	unsigned		i, j, len, retval;
+	unsigned		i, j, len;
+	int			retval;
 	u8			*buf;
 	char			*what = "?";
 	struct usb_device	*udev;
-	
+
 	if (length < 1 || length > 0xffff || vary >= length)
 		return -EINVAL;