diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-17 15:49:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-17 15:49:26 +1000 |
| commit | 1662b36701bb12e940c2389c23767103c7cae9e1 (patch) | |
| tree | 3a35fc74c53e6f890c6675bad999b3d027e811dc /drivers/staging/wlags49_h2/wl_sysfs.c | |
| parent | 0fe273c7c93ac38c09b51b849dd57c5e00a33737 (diff) | |
| parent | 7a6cb0d5497418599d2125b670926b75e673861c (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/hv/hv.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/rtl8187se/r8180_core.c
drivers/staging/wavelan/wavelan.c
drivers/staging/wavelan/wavelan_cs.c
drivers/staging/wlags49_h2/wl_cs.c
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_sysfs.c')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_sysfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/wlags49_h2/wl_sysfs.c b/drivers/staging/wlags49_h2/wl_sysfs.c index 864e01a736c8..e4c8804ac37d 100644 --- a/drivers/staging/wlags49_h2/wl_sysfs.c +++ b/drivers/staging/wlags49_h2/wl_sysfs.c @@ -46,7 +46,8 @@ static ssize_t show_tallies(struct device *d, struct device_attribute *attr, if (dev_isalive(dev)) { wl_lock(lp, &flags); - if ((ret = wl_get_tallies(lp, &tallies)) == 0) { + ret = wl_get_tallies(lp, &tallies); + if (ret == 0) { wl_unlock(lp, &flags); ret = snprintf(buf, PAGE_SIZE, "TxUnicastFrames: %u\n" |