diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:34 -0400 |
| commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /drivers/net/usb/smsc95xx.c | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/usb/smsc95xx.c')
| -rw-r--r-- | drivers/net/usb/smsc95xx.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index dc1665326592..5a7283372b53 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c | |||
| @@ -941,6 +941,16 @@ static int smsc95xx_reset(struct usbnet *dev) | |||
| 941 | if (netif_msg_ifup(dev)) | 941 | if (netif_msg_ifup(dev)) |
| 942 | devdbg(dev, "ID_REV = 0x%08x", read_buf); | 942 | devdbg(dev, "ID_REV = 0x%08x", read_buf); |
| 943 | 943 | ||
| 944 | /* Configure GPIO pins as LED outputs */ | ||
| 945 | write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED | | ||
| 946 | LED_GPIO_CFG_FDX_LED; | ||
| 947 | ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf); | ||
| 948 | if (ret < 0) { | ||
| 949 | devwarn(dev, "Failed to write LED_GPIO_CFG register, ret=%d", | ||
| 950 | ret); | ||
| 951 | return ret; | ||
| 952 | } | ||
| 953 | |||
| 944 | /* Init Tx */ | 954 | /* Init Tx */ |
| 945 | write_buf = 0; | 955 | write_buf = 0; |
| 946 | ret = smsc95xx_write_reg(dev, FLOW, write_buf); | 956 | ret = smsc95xx_write_reg(dev, FLOW, write_buf); |
| @@ -1231,6 +1241,11 @@ static const struct usb_device_id products[] = { | |||
| 1231 | USB_DEVICE(0x0424, 0x9500), | 1241 | USB_DEVICE(0x0424, 0x9500), |
| 1232 | .driver_info = (unsigned long) &smsc95xx_info, | 1242 | .driver_info = (unsigned long) &smsc95xx_info, |
| 1233 | }, | 1243 | }, |
| 1244 | { | ||
| 1245 | /* SMSC9512/9514 USB Hub & Ethernet Device */ | ||
| 1246 | USB_DEVICE(0x0424, 0xec00), | ||
| 1247 | .driver_info = (unsigned long) &smsc95xx_info, | ||
| 1248 | }, | ||
| 1234 | { }, /* END */ | 1249 | { }, /* END */ |
| 1235 | }; | 1250 | }; |
| 1236 | MODULE_DEVICE_TABLE(usb, products); | 1251 | MODULE_DEVICE_TABLE(usb, products); |