Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -577,6 +577,10 @@ static int p9_virtio_probe(struct virtio_device *vdev)
|
||||
mutex_lock(&virtio_9p_lock);
|
||||
list_add_tail(&chan->chan_list, &virtio_chan_list);
|
||||
mutex_unlock(&virtio_9p_lock);
|
||||
|
||||
/* Let udev rules use the new mount_tag attribute. */
|
||||
kobject_uevent(&(vdev->dev.kobj), KOBJ_CHANGE);
|
||||
|
||||
return 0;
|
||||
|
||||
out_free_tag:
|
||||
@@ -654,6 +658,7 @@ static void p9_virtio_remove(struct virtio_device *vdev)
|
||||
list_del(&chan->chan_list);
|
||||
mutex_unlock(&virtio_9p_lock);
|
||||
sysfs_remove_file(&(vdev->dev.kobj), &dev_attr_mount_tag.attr);
|
||||
kobject_uevent(&(vdev->dev.kobj), KOBJ_CHANGE);
|
||||
kfree(chan->tag);
|
||||
kfree(chan->vc_wq);
|
||||
kfree(chan);
|
||||
|
||||
@@ -253,10 +253,10 @@ void __cfg80211_sched_scan_results(struct work_struct *wk)
|
||||
rdev = container_of(wk, struct cfg80211_registered_device,
|
||||
sched_scan_results_wk);
|
||||
|
||||
request = rdev->sched_scan_req;
|
||||
|
||||
mutex_lock(&rdev->sched_scan_mtx);
|
||||
|
||||
request = rdev->sched_scan_req;
|
||||
|
||||
/* we don't have sched_scan_req anymore if the scan is stopping */
|
||||
if (request) {
|
||||
if (request->flags & NL80211_SCAN_FLAG_FLUSH) {
|
||||
|
||||
Reference in New Issue
Block a user