diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-17 15:54:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-17 15:54:40 -0700 |
| commit | 75a241f959a65ec9bde237d1af1a34ef794f0c9c (patch) | |
| tree | 6a2b9fe1b525b69ac094d6ae088e00cb5d626969 /drivers/net/wireless/rt2x00 | |
| parent | e18e37e50966f137f8a3b807fe0da7703779be34 (diff) | |
| parent | 957b0516f7881284b48f2f2e4a909a1c5de0ddf8 (diff) | |
| download | blackbird-op-linux-75a241f959a65ec9bde237d1af1a34ef794f0c9c.tar.gz blackbird-op-linux-75a241f959a65ec9bde237d1af1a34ef794f0c9c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 05f94e21b423..5752aaae906b 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -646,10 +646,8 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev) * Register HW. */ status = ieee80211_register_hw(rt2x00dev->hw); - if (status) { - rt2x00lib_remove_hw(rt2x00dev); + if (status) return status; - } set_bit(DEVICE_STATE_REGISTERED_HW, &rt2x00dev->flags); diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 420fff42c0dd..853b2b279b64 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c @@ -2369,6 +2369,8 @@ static struct usb_device_id rt73usb_device_table[] = { /* Buffalo */ { USB_DEVICE(0x0411, 0x00d8), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x0411, 0x00f4), USB_DEVICE_DATA(&rt73usb_ops) }, + { USB_DEVICE(0x0411, 0x0116), USB_DEVICE_DATA(&rt73usb_ops) }, + { USB_DEVICE(0x0411, 0x0119), USB_DEVICE_DATA(&rt73usb_ops) }, /* CNet */ { USB_DEVICE(0x1371, 0x9022), USB_DEVICE_DATA(&rt73usb_ops) }, { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) }, |
