From b1e214fcac7bd542da6a1f7db40546d86ef6c00a Mon Sep 17 00:00:00 2001
From: Volokh Konstantin <volokh84@gmail.com>
Date: Wed, 16 Jan 2013 09:00:50 -0300
Subject: [PATCH] --- yaml --- r: 357490 b: refs/heads/master c:
 d18b6acfe2f1c279ab2fb510eabc405cf538fb68 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/media/go7007/go7007-driver.c | 5 +++++
 trunk/drivers/staging/media/go7007/go7007-usb.c    | 3 ---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index aa94d0faf58f..a63e1b1da1e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a295d1289f2be16f80f0a5242db330d542e0037
+refs/heads/master: d18b6acfe2f1c279ab2fb510eabc405cf538fb68
diff --git a/trunk/drivers/staging/media/go7007/go7007-driver.c b/trunk/drivers/staging/media/go7007/go7007-driver.c
index 00014e754c75..0aaeb0aeb99e 100644
--- a/trunk/drivers/staging/media/go7007/go7007-driver.c
+++ b/trunk/drivers/staging/media/go7007/go7007-driver.c
@@ -173,6 +173,11 @@ static int go7007_init_encoder(struct go7007 *go)
 		go7007_write_addr(go, 0x3c82, 0x0001);
 		go7007_write_addr(go, 0x3c80, 0x00fe);
 	}
+	if (go->board_id == GO7007_BOARDID_ADLINK_MPG24) {
+		/* set GPIO5 to be an output, currently low */
+		go7007_write_addr(go, 0x3c82, 0x0000);
+		go7007_write_addr(go, 0x3c80, 0x00df);
+	}
 	return 0;
 }
 
diff --git a/trunk/drivers/staging/media/go7007/go7007-usb.c b/trunk/drivers/staging/media/go7007/go7007-usb.c
index a6cad1589475..9dbf5ecd05a2 100644
--- a/trunk/drivers/staging/media/go7007/go7007-usb.c
+++ b/trunk/drivers/staging/media/go7007/go7007-usb.c
@@ -1110,9 +1110,6 @@ static int go7007_usb_probe(struct usb_interface *intf,
 			} else {
 				u16 channel;
 
-				/* set GPIO5 to be an output, currently low */
-				go7007_write_addr(go, 0x3c82, 0x0000);
-				go7007_write_addr(go, 0x3c80, 0x00df);
 				/* read channel number from GPIO[1:0] */
 				go7007_read_addr(go, 0x3c81, &channel);
 				channel &= 0x3;