diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /sound/usb/endpoint.c | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'sound/usb/endpoint.c')
| -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 | ||