diff --git a/[refs] b/[refs] index 6197f5ad2d7f..c1b097215a92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f18f767e5f9a4c5a9fa976df168d0f3e33c91da +refs/heads/master: 22f88fcf407933321d08c45520fbeffca70b05d1 diff --git a/trunk/drivers/staging/easycap/easycap_main.c b/trunk/drivers/staging/easycap/easycap_main.c index bea281624c41..3ea51c373914 100644 --- a/trunk/drivers/staging/easycap/easycap_main.c +++ b/trunk/drivers/staging/easycap/easycap_main.c @@ -953,8 +953,10 @@ static unsigned int easycap_poll(struct file *file, poll_table *wait) * peasycap, IN WHICH CASE A REPEAT CALL TO isdongle() WILL FAIL. * IF NECESSARY, BAIL OUT. */ - if (kd != isdongle(peasycap)) + if (kd != isdongle(peasycap)) { + mutex_unlock(&easycapdc60_dongle[kd].mutex_video); return -ERESTARTSYS; + } if (!file) { SAY("ERROR: file is NULL\n"); mutex_unlock(&easycapdc60_dongle[kd].mutex_video);