diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 18:10:00 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 18:24:54 -0400 |
| commit | f1207ba1a756610a9880fe4b70d7f0e9f0627073 (patch) | |
| tree | f6840b54e05cbffb70e64e9646245b0068217b03 /drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | |
| parent | 27be44ff8ee29e945adad226cc360c9278239d17 (diff) | |
| download | op-kernel-dev-f1207ba1a756610a9880fe4b70d7f0e9f0627073.zip op-kernel-dev-f1207ba1a756610a9880fe4b70d7f0e9f0627073.tar.gz | |
[PATCH] bcm43xx: fix-up build breakage from merging patches out of order
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c index ac39401..ece3351 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c @@ -333,9 +333,9 @@ static ssize_t bcm43xx_attr_phymode_store(struct device *dev, goto out; } - bcm43xx_lock_noirq(bcm); + mutex_lock(&(bcm)->mutex); err = bcm43xx_select_wireless_core(bcm, phytype); - bcm43xx_unlock_noirq(bcm); + mutex_unlock(&(bcm)->mutex); if (err == -ESRCH) err = -ENODEV; @@ -350,7 +350,7 @@ static ssize_t bcm43xx_attr_phymode_show(struct device *dev, struct bcm43xx_private *bcm = dev_to_bcm(dev); ssize_t count = 0; - bcm43xx_lock_noirq(bcm); + mutex_lock(&(bcm)->mutex); switch (bcm43xx_current_phy(bcm)->type) { case BCM43xx_PHYTYPE_A: snprintf(buf, PAGE_SIZE, "A"); @@ -364,7 +364,7 @@ static ssize_t bcm43xx_attr_phymode_show(struct device *dev, default: assert(0); } - bcm43xx_unlock_noirq(bcm); + mutex_unlock(&(bcm)->mutex); return count; } |
