git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
drivers
/
staging
/
wlags49_h2
/
wl_sysfs.c
diff --git
a/drivers/staging/wlags49_h2/wl_sysfs.c
b/drivers/staging/wlags49_h2/wl_sysfs.c
index
e4c8804
..
9b833b3
100644
(file)
--- a/
drivers/staging/wlags49_h2/wl_sysfs.c
+++ b/
drivers/staging/wlags49_h2/wl_sysfs.c
@@
-42,7
+42,7
@@
static ssize_t show_tallies(struct device *d, struct device_attribute *attr,
CFG_HERMES_TALLIES_STRCT tallies;
ssize_t ret = -EINVAL;
- r
ead_lock(&dev_base_lock
);
+ r
cu_read_lock(
);
if (dev_isalive(dev)) {
wl_lock(lp, &flags);
@@
-102,7
+102,7
@@
static ssize_t show_tallies(struct device *d, struct device_attribute *attr,
}
}
- r
ead_unlock(&dev_base_lock
);
+ r
cu_read_unlock(
);
return ret;
}