diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-21 11:08:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-21 11:08:41 -0400 |
| commit | d69f309f0477fc13418f7526639f9ed527ff01e5 (patch) | |
| tree | 784b6ea14e63cc09f2531f9d72651e51307c1827 /sound | |
| parent | 2ac90e990c657d63a2d042f26ea495dcdcd87c2a (diff) | |
| parent | 272cbc98cfbdd30cff37a35f8ad8f1b737288e88 (diff) | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/endpoint.c | 1 |
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) | |||
| 427 | if (snd_usb_parse_audio_format(chip, fp, format, fmt, stream, alts) < 0) { | 427 | if (snd_usb_parse_audio_format(chip, fp, format, fmt, stream, alts) < 0) { |
| 428 | kfree(fp->rate_table); | 428 | kfree(fp->rate_table); |
| 429 | kfree(fp); | 429 | kfree(fp); |
| 430 | fp = NULL; | ||
| 430 | continue; | 431 | continue; |
| 431 | } | 432 | } |
| 432 | 433 | ||