diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-16 15:11:44 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-16 15:11:44 -0400 |
commit | 08e6d907fe606b751adddce54ad8f51e0950bc3f (patch) | |
tree | 1a987f519b1ea706a61cd23d7eeea038dfe81b7a /drivers/net | |
parent | d34c34fb2592bd5231a153ad1676c3ded175410a (diff) | |
parent | 671267bf3aac3dae0555730b07ef29c042e325b2 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/usb.c | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index f7868c0d79ed..2062ea1d7c80 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -1853,14 +1853,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, | |||
1853 | /*like read eeprom and so on */ | 1853 | /*like read eeprom and so on */ |
1854 | rtlpriv->cfg->ops->read_eeprom_info(hw); | 1854 | rtlpriv->cfg->ops->read_eeprom_info(hw); |
1855 | 1855 | ||
1856 | if (rtlpriv->cfg->ops->init_sw_vars(hw)) { | ||
1857 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n"); | ||
1858 | err = -ENODEV; | ||
1859 | goto fail3; | ||
1860 | } | ||
1861 | |||
1862 | rtlpriv->cfg->ops->init_sw_leds(hw); | ||
1863 | |||
1864 | /*aspm */ | 1856 | /*aspm */ |
1865 | rtl_pci_init_aspm(hw); | 1857 | rtl_pci_init_aspm(hw); |
1866 | 1858 | ||
@@ -1879,6 +1871,14 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, | |||
1879 | goto fail3; | 1871 | goto fail3; |
1880 | } | 1872 | } |
1881 | 1873 | ||
1874 | if (rtlpriv->cfg->ops->init_sw_vars(hw)) { | ||
1875 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n"); | ||
1876 | err = -ENODEV; | ||
1877 | goto fail3; | ||
1878 | } | ||
1879 | |||
1880 | rtlpriv->cfg->ops->init_sw_leds(hw); | ||
1881 | |||
1882 | err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group); | 1882 | err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group); |
1883 | if (err) { | 1883 | if (err) { |
1884 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 1884 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c index d04dbda13f5a..a6049d7d51b3 100644 --- a/drivers/net/wireless/rtlwifi/usb.c +++ b/drivers/net/wireless/rtlwifi/usb.c | |||
@@ -971,11 +971,6 @@ int __devinit rtl_usb_probe(struct usb_interface *intf, | |||
971 | rtlpriv->cfg->ops->read_chip_version(hw); | 971 | rtlpriv->cfg->ops->read_chip_version(hw); |
972 | /*like read eeprom and so on */ | 972 | /*like read eeprom and so on */ |
973 | rtlpriv->cfg->ops->read_eeprom_info(hw); | 973 | rtlpriv->cfg->ops->read_eeprom_info(hw); |
974 | if (rtlpriv->cfg->ops->init_sw_vars(hw)) { | ||
975 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n"); | ||
976 | goto error_out; | ||
977 | } | ||
978 | rtlpriv->cfg->ops->init_sw_leds(hw); | ||
979 | err = _rtl_usb_init(hw); | 974 | err = _rtl_usb_init(hw); |
980 | if (err) | 975 | if (err) |
981 | goto error_out; | 976 | goto error_out; |
@@ -987,6 +982,11 @@ int __devinit rtl_usb_probe(struct usb_interface *intf, | |||
987 | "Can't allocate sw for mac80211\n"); | 982 | "Can't allocate sw for mac80211\n"); |
988 | goto error_out; | 983 | goto error_out; |
989 | } | 984 | } |
985 | if (rtlpriv->cfg->ops->init_sw_vars(hw)) { | ||
986 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n"); | ||
987 | goto error_out; | ||
988 | } | ||
989 | rtlpriv->cfg->ops->init_sw_leds(hw); | ||
990 | 990 | ||
991 | return 0; | 991 | return 0; |
992 | error_out: | 992 | error_out: |