From 5a3a01fce5cf23745b190a466dd2e5a574972653 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Wed, 31 Aug 2011 01:57:10 +0400 Subject: [PATCH] --- yaml --- r: 268260 b: refs/heads/master c: f19885fadfdb0bf410b5e31c7dc2f2be7815e454 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/sep/sep_driver.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f33cd603a083..c95bb3666ff9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 129957069e6af42a6e021d90679c56662c95f7e1 +refs/heads/master: f19885fadfdb0bf410b5e31c7dc2f2be7815e454 diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c index bf7286e01a39..8ac3faea2d2f 100644 --- a/trunk/drivers/staging/sep/sep_driver.c +++ b/trunk/drivers/staging/sep/sep_driver.c @@ -2420,11 +2420,12 @@ static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) (sep->pid_doing_transaction != 0)) { dev_dbg(&sep->pdev->dev, "ioctl pid is not owner\n"); error = -EACCES; - goto end_function; } - mutex_unlock(&sep->sep_mutex); + if (error) + return error; + if (_IOC_TYPE(cmd) != SEP_IOC_MAGIC_NUMBER) return -ENOTTY; @@ -2461,7 +2462,6 @@ static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) break; } -end_function: mutex_unlock(&sep->ioctl_mutex); return error; }