diff --git a/[refs] b/[refs] index 711dc98a292f..bf92676f4bb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1ffd62b8fc87e842431cc693821d7f1ac70b9de +refs/heads/master: 8892384803af7082056fe29faef02fd0c762493e diff --git a/trunk/drivers/staging/wlags49_h2/wl_sysfs.c b/trunk/drivers/staging/wlags49_h2/wl_sysfs.c index e4c8804ac37d..9b833b30ae62 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_sysfs.c +++ b/trunk/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; - read_lock(&dev_base_lock); + rcu_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, } } - read_unlock(&dev_base_lock); + rcu_read_unlock(); return ret; }