From c21e25dd2c31f2753739fa4d126b9f24d905045f Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 4 Jan 2013 14:56:02 -0300 Subject: [PATCH] --- yaml --- r: 357347 b: refs/heads/master c: c4fe29a32ffa16c1166edacad1edc2dcf0aaa08c h: refs/heads/master i: 357345: 295db1dfbcdc9dc167a812e40960eec26adbe8d6 357343: fad3d5949b9147a8303d168dbcb722bc50470f62 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb-core/dvb_ca_en50221.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9b11e6723dd..e0d289dd0df9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9898df6482f71fa0d27b029789ef2f37988c06b3 +refs/heads/master: c4fe29a32ffa16c1166edacad1edc2dcf0aaa08c diff --git a/trunk/drivers/media/dvb-core/dvb_ca_en50221.c b/trunk/drivers/media/dvb-core/dvb_ca_en50221.c index 190e5e0f48c7..0aac3096728e 100644 --- a/trunk/drivers/media/dvb-core/dvb_ca_en50221.c +++ b/trunk/drivers/media/dvb-core/dvb_ca_en50221.c @@ -1227,8 +1227,10 @@ static int dvb_ca_en50221_io_do_ioctl(struct file *file, case CA_GET_SLOT_INFO: { struct ca_slot_info *info = parg; - if ((info->num > ca->slot_count) || (info->num < 0)) - return -EINVAL; + if ((info->num > ca->slot_count) || (info->num < 0)) { + err = -EINVAL; + goto out_unlock; + } info->type = CA_CI_LINK; info->flags = 0; @@ -1247,6 +1249,7 @@ static int dvb_ca_en50221_io_do_ioctl(struct file *file, break; } +out_unlock: mutex_unlock(&ca->ioctl_mutex); return err; }