diff options
Diffstat (limited to 'drivers/net/wireless/b43legacy/main.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 10 | 
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 1ab8861dd43..d6db6c17da4 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -1564,10 +1564,10 @@ static int b43legacy_request_firmware(struct b43legacy_wldev *dev)  	struct b43legacy_firmware *fw = &dev->fw;  	const u8 rev = dev->dev->id.revision;  	const char *filename; -	u32 tmshigh;  	int err; -	tmshigh = ssb_read32(dev->dev, SSB_TMSHIGH); +	/* do dummy read */ +	ssb_read32(dev->dev, SSB_TMSHIGH);  	if (!fw->ucode) {  		if (rev == 2)  			filename = "ucode2"; @@ -2634,11 +2634,9 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,  	unsigned long flags;  	unsigned int new_phymode = 0xFFFF;  	int antenna_tx; -	int antenna_rx;  	int err = 0;  	antenna_tx = B43legacy_ANTENNA_DEFAULT; -	antenna_rx = B43legacy_ANTENNA_DEFAULT;  	mutex_lock(&wl->mutex);  	dev = wl->current_dev; @@ -2775,14 +2773,12 @@ static void b43legacy_op_bss_info_changed(struct ieee80211_hw *hw,  {  	struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);  	struct b43legacy_wldev *dev; -	struct b43legacy_phy *phy;  	unsigned long flags;  	mutex_lock(&wl->mutex);  	B43legacy_WARN_ON(wl->vif != vif);  	dev = wl->current_dev; -	phy = &dev->phy;  	/* Disable IRQs while reconfiguring the device.  	 * This makes it possible to drop the spinlock throughout @@ -2974,7 +2970,7 @@ static int b43legacy_phy_versioning(struct b43legacy_wldev *dev)  		break;  	default:  		unsupported = 1; -	}; +	}  	if (unsupported) {  		b43legacyerr(dev->wl, "FOUND UNSUPPORTED PHY "  		       "(Analog %u, Type %u, Revision %u)\n",  | 
