From 8c6513449c2afb56ad5ec82a0f2e5e3c38c33301 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 17 Nov 2008 14:52:56 -0300
Subject: [PATCH] --- yaml --- r: 124231 b: refs/heads/master c:
 cc043428e5869a629252665d3ecc86ee4c14db3d h: refs/heads/master i:   124229:
 da6f88ab3c6417e71ea6b3dbecbe12a9c623db23   124227:
 812c93a6dce61ac89560954c6ae0edfc397b2acf   124223:
 7e782cc1a75d595e5ca247c990c1e530a7892265 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/video/gspca/spca501.c | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 2ed6bc6920d5..b53888d1335b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dff369aad6407e7b123e239e9ea2f552299cf74c
+refs/heads/master: cc043428e5869a629252665d3ecc86ee4c14db3d
diff --git a/trunk/drivers/media/video/gspca/spca501.c b/trunk/drivers/media/video/gspca/spca501.c
index e29954c1c38c..1fdaf8605b08 100644
--- a/trunk/drivers/media/video/gspca/spca501.c
+++ b/trunk/drivers/media/video/gspca/spca501.c
@@ -1930,6 +1930,14 @@ static int sd_config(struct gspca_dev *gspca_dev,
 	sd->contrast = sd_ctrls[MY_CONTRAST].qctrl.default_value;
 	sd->colors = sd_ctrls[MY_COLOR].qctrl.default_value;
 
+	return 0;
+}
+
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
+{
+	struct sd *sd = (struct sd *) gspca_dev;
+
 	switch (sd->subtype) {
 	case Arowana300KCMOSCamera:
 	case SmileIntlCamera:
@@ -1948,15 +1956,17 @@ static int sd_config(struct gspca_dev *gspca_dev,
 			goto error;
 		break;
 	}
+	PDEBUG(D_STREAM, "Initializing SPCA501 finished");
 	return 0;
 error:
 	return -EINVAL;
 }
 
-/* this function is called at probe and resume time */
-static int sd_init(struct gspca_dev *gspca_dev)
+static int sd_start(struct gspca_dev *gspca_dev)
 {
 	struct sd *sd = (struct sd *) gspca_dev;
+	struct usb_device *dev = gspca_dev->dev;
+	int mode;
 
 	switch (sd->subtype) {
 	case ThreeComHomeConnectLite:
@@ -1976,14 +1986,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
 		/* Generic 501 open data */
 		write_vector(gspca_dev, spca501_open_data);
 	}
-	PDEBUG(D_STREAM, "Initializing SPCA501 finished");
-	return 0;
-}
-
-static int sd_start(struct gspca_dev *gspca_dev)
-{
-	struct usb_device *dev = gspca_dev->dev;
-	int mode;
 
 	/* memorize the wanted pixel format */
 	mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;