From 7ee150c3ad7a72afe7aeb31ce47b66673c00a664 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 29 Jun 2010 01:42:53 -0300 Subject: [PATCH] --- yaml --- r: 202018 b: refs/heads/master c: 4c61f678a468768afd45c3d9ac697f8f55aa04eb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-ioread.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2465465ff7a7..23ca48102d75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3b1dc95578fd0b524139689a9e0f148a622eb24 +refs/heads/master: 4c61f678a468768afd45c3d9ac697f8f55aa04eb diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-ioread.c index b4824782d858..bba6115c9ae8 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-ioread.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-ioread.c @@ -223,7 +223,10 @@ int pvr2_ioread_setup(struct pvr2_ioread *cp,struct pvr2_stream *sp) " pvr2_ioread_setup (setup) id=%p",cp); pvr2_stream_kill(sp); ret = pvr2_stream_set_buffer_count(sp,BUFFER_COUNT); - if (ret < 0) return ret; + if (ret < 0) { + mutex_unlock(&cp->mutex); + return ret; + } for (idx = 0; idx < BUFFER_COUNT; idx++) { bp = pvr2_stream_get_buffer(sp,idx); pvr2_buffer_set_buffer(bp,