---

yaml --- r: 357347 b: refs/heads/master c: c4fe29a h: refs/heads/master i: 357345: 295db1d 357343: fad3d59 v: v3
git-mirror · Jan 6, 2013 · c21e25d · c21e25d
1 parent e64b737
commit c21e25d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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;
 }