Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36447
b: refs/heads/master
c: b6956ff
h: refs/heads/master
i:
  36445: a6d37a0
  36443: 34a01aa
  36439: ae23f0b
  36431: 8ca1932
  36415: 5ab9b0c
v: v3
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Sep 27, 2006
1 parent 026df53 commit 1f272ca
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d1ad4ea331e78a5ff90eda7718da31bcbc1a9c38
refs/heads/master: b6956ffa595db97656d5901ca8fec77ef272d41a
1 change: 1 addition & 0 deletions trunk/drivers/usb/core/hub.c
Original file line number Diff line number Diff line change
Expand Up @@ -2414,6 +2414,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
usb_set_device_state(udev, USB_STATE_POWERED);
udev->speed = USB_SPEED_UNKNOWN;
udev->bus_mA = hub->mA_per_port;
udev->level = hdev->level + 1;

/* set the address */
choose_address(udev);
Expand Down
1 change: 1 addition & 0 deletions trunk/include/linux/usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ struct usb_device {

unsigned short bus_mA; /* Current available from the bus */
u8 portnum; /* Parent port number (origin 1) */
u8 level; /* Number of USB hub ancestors */

int have_langid; /* whether string_langid is valid */
int string_langid; /* language ID for strings */
Expand Down

0 comments on commit 1f272ca

Please sign in to comment.