Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41334
b: refs/heads/master
c: ce36158
h: refs/heads/master
v: v3
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Dec 1, 2006
1 parent 252f187 commit bebaaa9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1f9fc882d92f3ff390455836f98d7ddc36d4e4c3
refs/heads/master: ce3615879ae85373c03744b45b7c2d7ae5e29b2a
2 changes: 1 addition & 1 deletion trunk/drivers/usb/core/message.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit bebaaa9

Please sign in to comment.