diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-09-15 19:29:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-09-15 19:29:07 -0400 |
| commit | a2ca44c30dd351cd386f4fb9f8590b999030274a (patch) | |
| tree | 53cef142e48ca8453b3277a3b7452c53cdb54793 /drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | |
| parent | a041fe2e8d0bd749b2416ef79adc416e24af7c63 (diff) | |
| parent | 53c5725581cce8a29925afd4eae71fa8c7ce551f (diff) | |
| download | op-kernel-dev-a2ca44c30dd351cd386f4fb9f8590b999030274a.zip op-kernel-dev-a2ca44c30dd351cd386f4fb9f8590b999030274a.tar.gz | |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c index c71b998..8ab5f93 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c @@ -327,7 +327,7 @@ static ssize_t bcm43xx_attr_phymode_store(struct device *dev, goto out; } - bcm43xx_periodic_tasks_delete(bcm); + bcm43xx_cancel_work(bcm); mutex_lock(&(bcm)->mutex); err = bcm43xx_select_wireless_core(bcm, phytype); if (!err) |
