summaryrefslogtreecommitdiff
path: root/sound/aoa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-09-16 08:29:04 +0200
committerTakashi Iwai <tiwai@suse.de>2011-09-16 08:29:04 +0200
commit0308110615acb4b6409fe042caf22bb9fb075d85 (patch)
treed129f11ebdbe49b21246a72e6ba52c50e81e8e7e /sound/aoa
parentc731bc96ad641a5fa3d50a87b474652505507282 (diff)
parent763437a9e7737535b2fc72175ad4974048769be6 (diff)
downloadlinux-3.10-0308110615acb4b6409fe042caf22bb9fb075d85.tar.gz
linux-3.10-0308110615acb4b6409fe042caf22bb9fb075d85.tar.bz2
linux-3.10-0308110615acb4b6409fe042caf22bb9fb075d85.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/aoa')
-rw-r--r--sound/aoa/fabrics/layout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
index 3fd1a7e2492..552b97afbca 100644
--- a/sound/aoa/fabrics/layout.c
+++ b/sound/aoa/fabrics/layout.c
@@ -1073,10 +1073,10 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
sdev->pcmid = -1;
list_del(&ldev->list);
layouts_list_items--;
+ kfree(ldev);
outnodev:
of_node_put(sound);
layout_device = NULL;
- kfree(ldev);
return -ENODEV;
}