diff --git a/[refs] b/[refs]
index 105255a11c38..461f4065942d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f9fc882d92f3ff390455836f98d7ddc36d4e4c3
+refs/heads/master: ce3615879ae85373c03744b45b7c2d7ae5e29b2a
diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c
index 7729c0744886..5684d8722922 100644
--- a/trunk/drivers/usb/core/message.c
+++ b/trunk/drivers/usb/core/message.c
@@ -764,7 +764,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
 			err = -EINVAL;
 			goto errout;
 		} else {
-			dev->have_langid = -1;
+			dev->have_langid = 1;
 			dev->string_langid = tbuf[2] | (tbuf[3]<< 8);
 				/* always use the first langid listed */
 			dev_dbg (&dev->dev, "default language 0x%04x\n",
diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h
index 864c6c21c21e..5634a2d91ec0 100644
--- a/trunk/include/linux/usb.h
+++ b/trunk/include/linux/usb.h
@@ -362,7 +362,7 @@ struct usb_device {
 	u8 portnum;			/* Parent port number (origin 1) */
 	u8 level;			/* Number of USB hub ancestors */
 
-	int have_langid;		/* whether string_langid is valid */
+	unsigned have_langid:1;		/* whether string_langid is valid */
 	int string_langid;		/* language ID for strings */
 
 	/* static strings from the device */