summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-06-21 17:08:41 +0200
committerTakashi Iwai <tiwai@suse.de>2010-06-21 17:08:41 +0200
commitd69f309f0477fc13418f7526639f9ed527ff01e5 (patch)
tree784b6ea14e63cc09f2531f9d72651e51307c1827 /sound
parent2ac90e990c657d63a2d042f26ea495dcdcd87c2a (diff)
parent272cbc98cfbdd30cff37a35f8ad8f1b737288e88 (diff)
downloadlinux-d69f309f0477fc13418f7526639f9ed527ff01e5.tar.gz
linux-d69f309f0477fc13418f7526639f9ed527ff01e5.tar.bz2
linux-d69f309f0477fc13418f7526639f9ed527ff01e5.zip
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/endpoint.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 9593b91452b9..6f6596cf2b19 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -427,6 +427,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
if (snd_usb_parse_audio_format(chip, fp, format, fmt, stream, alts) < 0) {
kfree(fp->rate_table);
kfree(fp);
+ fp = NULL;
continue;
}