DVB Update [PATCH 13/31] multiproto tree

DVB Update [PATCH 13/31] multiproto tree

[Manu Abraham]

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

>From 8c37315b9966e21894a76b61177727b462992d65 Mon Sep 17 00:00:00 2001
From: Manu Abraham <manu@linuxtv.org>
Date: Thu, 4 Sep 2008 13:45:00 +0200
Subject: [PATCH] DVB Fix possible frontend deadlock

The frontend will deadlock if an unspecified delivery system
is specified. Before returning error for the unspecified
delivery system, unlock and then exit.

From: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>

 dvb_frontend.c |    1 +
 1 file changed, 1 insertion(+)

[-- Attachment #2: 13.patch --]
[-- Type: text/x-patch, Size: 932 bytes --]

>From 8c37315b9966e21894a76b61177727b462992d65 Mon Sep 17 00:00:00 2001
From: Manu Abraham <manu@linuxtv.org>
Date: Thu, 4 Sep 2008 13:45:00 +0200
Subject: [PATCH] DVB Fix possible frontend deadlock

The frontend will deadlock if an unspecified delivery system
is specified. Before returning error for the unspecified
delivery system, unlock and then exit.

From: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 125facb..313c639 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1789,6 +1789,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
 				fepriv->max_drift = 0;
 				break;
 			default:
+				up(&fepriv->sem);
 				return -EINVAL;
 			}
 		}