From 9074d0edd9b8914f7bcfbfbe0d34c18bdde9eafb Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 28 Dec 2008 22:26:36 -0300
Subject: [PATCH] --- yaml --- r: 124463 b: refs/heads/master c:
 2e5ef2dfc45ff1ecebb0d8657b85b3fc716db9bf h: refs/heads/master i:   124461:
 1f15155162017a13f1a0949cc22fd846f32cf646   124459:
 8bea75e06edcfae7cde72d5567c1df4bc5859d9e   124455:
 8e074930ea930a64754687a4eb08fd9407ebf1b3   124447:
 29ca30405004328eb384a734707bfd6a0dfb1fb3 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c |  6 ------
 trunk/drivers/media/video/em28xx/em28xx-video.c | 11 +++--------
 trunk/drivers/media/video/em28xx/em28xx.h       |  1 -
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 8bc7c865d127..4c13c7ab68da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a23f81b7dc3115b29cff0e4f58b5dd04a6242ad
+refs/heads/master: 2e5ef2dfc45ff1ecebb0d8657b85b3fc716db9bf
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 42978f9592b7..3759f3a56cb7 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1948,12 +1948,6 @@ int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
 
 	em28xx_add_into_devlist(dev);
 
-	errCode = em28xx_analog_config(dev);
-	if (errCode) {
-		em28xx_errdev("error configuring device\n");
-		return -ENOMEM;
-	}
-
 	retval = em28xx_register_analog_devices(dev);
 	if (retval < 0) {
 		em28xx_release_resources(dev);
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index 4c0986920970..4a548fbd79d3 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -1950,8 +1950,10 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
 	return vfd;
 }
 
-int em28xx_analog_config(struct em28xx *dev)
+int em28xx_register_analog_devices(struct em28xx *dev)
 {
+	int ret;
+
 	printk(KERN_INFO "%s: v4l2 driver version %d.%d.%d\n",
 		dev->name,
 		(EM28XX_VERSION_CODE >> 16) & 0xff,
@@ -1985,13 +1987,6 @@ int em28xx_analog_config(struct em28xx *dev)
 	/* FIXME: This is a very bad hack! Not all devices have TV on input 2 */
 	dev->ctl_input = 2;
 
-	return 0;
-}
-
-int em28xx_register_analog_devices(struct em28xx *dev)
-{
-	int ret;
-
 	/* allocate and fill video video_device struct */
 	dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video");
 	if (!dev->vdev) {
diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h
index c8e71edbfea7..58a3675abb62 100644
--- a/trunk/drivers/media/video/em28xx/em28xx.h
+++ b/trunk/drivers/media/video/em28xx/em28xx.h
@@ -593,7 +593,6 @@ void em28xx_init_extension(struct em28xx *dev);
 void em28xx_close_extension(struct em28xx *dev);
 
 /* Provided by em28xx-video.c */
-int em28xx_analog_config(struct em28xx *dev);
 int em28xx_register_analog_devices(struct em28xx *dev);
 void em28xx_release_analog_resources(struct em28xx *dev);