diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-21 06:59:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-21 06:59:02 -0700 |
| commit | 79058c4b9ed82415d0690ce6d520252741653486 (patch) | |
| tree | b7857545498725b321306dbaa27c80bb35ccc41a /sound/aoa/fabrics/layout.c | |
| parent | 47c08f3107270e5a439bc0106a308f7c48c9621d (diff) | |
| parent | de75577c8c3ab733f808c65e1a9d55882efde68e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: sound/aoa/fabrics/layout.c: remove unneeded kfree
ALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_cirrus.c
ALSA: hda - Don't spew too many ELD errors
ALSA: usb-audio - Fix missing mixer dB information
ALSA: hda - Add "PCM" volume to vmaster slave list
ALSA: hda - Fix duplicated capture-volume creation for ALC268 models
ALSA: ac97: Add HP Compaq dc5100 SFF(PT003AW) to Headphone Jack Sense whitelist
ALSA: snd_usb_caiaq: track submitted output urbs
Diffstat (limited to 'sound/aoa/fabrics/layout.c')
| -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 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; } |