DVB Update [PATCH 17/31] multiproto tree

DVB Update [PATCH 17/31] multiproto tree

[Manu Abraham]

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

>From 0d44d9b7b6a6819b9599fa593ae888ed1a8d13da Mon Sep 17 00:00:00 2001
From: Manu Abraham <manu@linuxtv.org>
Date: Thu, 4 Sep 2008 14:04:07 +0200
Subject: [PATCH] DVB typo "&" and "&&" got swapped

From: Arvo Jarve <arvo@softshark.ee>
Signed-off-by: Arvo Jarve <arvo@softshark.ee>
Signed-off-by: Manu Abraham <manu@linuxtv.org>

 dvb_frontend.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


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

>From 0d44d9b7b6a6819b9599fa593ae888ed1a8d13da Mon Sep 17 00:00:00 2001
From: Manu Abraham <manu@linuxtv.org>
Date: Thu, 4 Sep 2008 14:04:07 +0200
Subject: [PATCH] DVB typo "&" and "&&" got swapped

From: Arvo Jarve <arvo@softshark.ee>
Signed-off-by: Arvo Jarve <arvo@softshark.ee>
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 784acbd..d8261b6 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1737,10 +1737,10 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
 		memset(&fetunesettings, 0, sizeof (struct dvb_frontend_tune_settings));
 		memcpy(&fetunesettings.fe_params, parg, sizeof (struct dvbfe_params));
 
-		if ((delsys && DVBFE_DELSYS_DVBS) ||
-		    (delsys && DVBFE_DELSYS_DVBC) ||
-		    (delsys && DVBFE_DELSYS_DVBT) ||
-		    (delsys && DVBFE_DELSYS_ATSC)) {
+		if ((delsys & DVBFE_DELSYS_DVBS) ||
+		    (delsys & DVBFE_DELSYS_DVBC) ||
+		    (delsys & DVBFE_DELSYS_DVBT) ||
+		    (delsys & DVBFE_DELSYS_ATSC)) {
 
 			if (newapi_to_olddrv(&fepriv->fe_params, &fepriv->parameters, fepriv->fe_info.delivery)  == -EINVAL)
 				printk("%s: ERROR !!! Converting New parameters --> Old parameters\n", __func__);