diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-16 02:29:04 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-16 02:29:04 -0400 |
| commit | 0308110615acb4b6409fe042caf22bb9fb075d85 (patch) | |
| tree | d129f11ebdbe49b21246a72e6ba52c50e81e8e7e /sound/aoa | |
| parent | c731bc96ad641a5fa3d50a87b474652505507282 (diff) | |
| parent | 763437a9e7737535b2fc72175ad4974048769be6 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/aoa')
| -rw-r--r-- | sound/aoa/fabrics/layout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index 3fd1a7e24928..552b97afbca5 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) | |||
| 1073 | sdev->pcmid = -1; | 1073 | sdev->pcmid = -1; |
| 1074 | list_del(&ldev->list); | 1074 | list_del(&ldev->list); |
| 1075 | layouts_list_items--; | 1075 | layouts_list_items--; |
| 1076 | kfree(ldev); | ||
| 1076 | outnodev: | 1077 | outnodev: |
| 1077 | of_node_put(sound); | 1078 | of_node_put(sound); |
| 1078 | layout_device = NULL; | 1079 | layout_device = NULL; |
| 1079 | kfree(ldev); | ||
| 1080 | return -ENODEV; | 1080 | return -ENODEV; |
| 1081 | } | 1081 | } |
| 1082 | 1082 | ||