From 9dd4b97afb1582c6db9f3a639c92b4bedab74909 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Wed, 19 Sep 2012 20:52:21 -0300
Subject: [PATCH] --- yaml --- r: 331207 b: refs/heads/master c:
 0c42a55c86228ba9d0969562fcebc2adc79bfddb h: refs/heads/master i:   331205:
 172162accdb240588eac913f432f962c4f35d593   331203:
 ad7c339449b7ecc24d2c629772bb2d9e8ae5d2e6   331199:
 af61ee1e8d079efb5e5a519238c2fb90e492359d v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/usb/em28xx/em28xx-dvb.c | 24 +++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index edfb3bc4767b..5884176991a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a36a66d7aaa6468a91941ffcfb6d324f28825910
+refs/heads/master: 0c42a55c86228ba9d0969562fcebc2adc79bfddb
diff --git a/trunk/drivers/media/usb/em28xx/em28xx-dvb.c b/trunk/drivers/media/usb/em28xx/em28xx-dvb.c
index 0ca3e05992bf..1662b70435b3 100644
--- a/trunk/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/trunk/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -1002,20 +1002,22 @@ static int em28xx_dvb_init(struct em28xx *dev)
 				result = -EINVAL;
 				goto out_free;
 			}
-		}
 
 #ifdef CONFIG_GPIOLIB
-		/* enable LNA for DVB-T, DVB-T2 and DVB-C */
-		result = gpio_request_one(dvb->lna_gpio, GPIOF_OUT_INIT_LOW,
-				NULL);
-		if (result)
-			em28xx_errdev("gpio request failed %d\n", result);
-		else
-			gpio_free(dvb->lna_gpio);
-
-		result = 0; /* continue even set LNA fails */
+			/* enable LNA for DVB-T, DVB-T2 and DVB-C */
+			result = gpio_request_one(dvb->lna_gpio,
+					GPIOF_OUT_INIT_LOW, NULL);
+			if (result)
+				em28xx_errdev("gpio request failed %d\n",
+						result);
+			else
+				gpio_free(dvb->lna_gpio);
+
+			result = 0; /* continue even set LNA fails */
 #endif
-		dvb->fe[0]->ops.set_lna = em28xx_pctv_290e_set_lna;
+			dvb->fe[0]->ops.set_lna = em28xx_pctv_290e_set_lna;
+		}
+
 		break;
 	case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C:
 	{