diff options
| author | Dave Jones <davej@redhat.com> | 2005-08-18 01:56:07 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-08-18 01:56:07 -0400 |
| commit | a8b3e6f10f08f66ae1072efd087b30966a3654f6 (patch) | |
| tree | 1d1409855f8ad5beabafe061c6453edd84ba94c8 /sound/usb/usx2y/usbusx2yaudio.c | |
| parent | 46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 (diff) | |
| parent | 099d44e869f1886b5eb02a5145ca97b5e4142e28 (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/usb/usx2y/usbusx2yaudio.c')
| -rw-r--r-- | sound/usb/usx2y/usbusx2yaudio.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 4c292e090069..62dfd28b3b07 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c | |||
| @@ -401,10 +401,8 @@ static void usX2Y_urbs_release(snd_usX2Y_substream_t *subs) | |||
| 401 | for (i = 0; i < NRURBS; i++) | 401 | for (i = 0; i < NRURBS; i++) |
| 402 | usX2Y_urb_release(subs->urb + i, subs != subs->usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]); | 402 | usX2Y_urb_release(subs->urb + i, subs != subs->usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]); |
| 403 | 403 | ||
| 404 | if (subs->tmpbuf) { | 404 | kfree(subs->tmpbuf); |
| 405 | kfree(subs->tmpbuf); | 405 | subs->tmpbuf = NULL; |
| 406 | subs->tmpbuf = NULL; | ||
| 407 | } | ||
| 408 | } | 406 | } |
| 409 | /* | 407 | /* |
| 410 | * initialize a substream's urbs | 408 | * initialize a substream's urbs |