From 29e8b5f579d9b75c3d90c42c283c2be821fd25c1 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 22 Mar 2013 09:54:00 -0300
Subject: [PATCH] --- yaml --- r: 366712 b: refs/heads/master c:
 bc3d292803409ce44febffb8e6839faae6e768fb h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/usb/em28xx/em28xx-cards.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3ae832d015a8..5b76566500db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3190fbee0176a40a8dd13200862d39f956692f63
+refs/heads/master: bc3d292803409ce44febffb8e6839faae6e768fb
diff --git a/trunk/drivers/media/usb/em28xx/em28xx-cards.c b/trunk/drivers/media/usb/em28xx/em28xx-cards.c
index 46fff5c3335b..cb7cdd322702 100644
--- a/trunk/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2229,8 +2229,9 @@ static unsigned short msp3400_addrs[] = {
 
 int em28xx_tuner_callback(void *ptr, int component, int command, int arg)
 {
+	struct em28xx_i2c_bus *i2c_bus = ptr;
+	struct em28xx *dev = i2c_bus->dev;
 	int rc = 0;
-	struct em28xx *dev = ptr;
 
 	if (dev->tuner_type != TUNER_XC2028 && dev->tuner_type != TUNER_XC5000)
 		return 0;