projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
net
/
9p
/
trans_virtio.c
diff --git
a/net/9p/trans_virtio.c
b/net/9p/trans_virtio.c
index
2bbd7dc
..
490a4c9
100644
(file)
--- a/
net/9p/trans_virtio.c
+++ b/
net/9p/trans_virtio.c
@@
-610,7
+610,7
@@
static int p9_virtio_probe(struct virtio_device *vdev)
chan->vc_wq = kmalloc(sizeof(wait_queue_head_t), GFP_KERNEL);
if (!chan->vc_wq) {
err = -ENOMEM;
chan->vc_wq = kmalloc(sizeof(wait_queue_head_t), GFP_KERNEL);
if (!chan->vc_wq) {
err = -ENOMEM;
- goto out_
free_tag
;
+ goto out_
remove_file
;
}
init_waitqueue_head(chan->vc_wq);
chan->ring_bufs_avail = 1;
}
init_waitqueue_head(chan->vc_wq);
chan->ring_bufs_avail = 1;
@@
-628,6
+628,8
@@
static int p9_virtio_probe(struct virtio_device *vdev)
return 0;
return 0;
+out_remove_file:
+ sysfs_remove_file(&vdev->dev.kobj, &dev_attr_mount_tag.attr);
out_free_tag:
kfree(tag);
out_free_vq:
out_free_tag:
kfree(tag);
out_free_vq: