Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits)
  V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
  V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
  V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
  V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
  V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
  V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
  V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
  V4L/DVB (9179): S2API: frontend.h cleanup
  V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
  V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
  V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
  V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
  V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
  V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
  V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
  V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
  V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
  V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
  V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
  V4L/DVB: v4l2-dev: remove duplicated #include
  ...

1 files changed, 37 insertions, 15 deletions

diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index 56808cd2f8a9..2584201059d8 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -134,34 +134,56 @@ static int reg_clear(struct soc_camera_device *icd, const u8 reg,
 static int mt9v022_init(struct soc_camera_device *icd)
 {
         struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+        struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
         int ret;
 
+        if (icl->power) {
+                ret = icl->power(&mt9v022->client->dev, 1);
+                if (ret < 0) {
+                        dev_err(icd->vdev->parent,
+                                "Platform failed to power-on the camera.\n");
+                        return ret;
+                }
+        }
+
+        /*
+         * The camera could have been already on, we hard-reset it additionally,
+         * if available. Soft reset is done in video_probe().
+         */
+        if (icl->reset)
+                icl->reset(&mt9v022->client->dev);
+
         /* Almost the default mode: master, parallel, simultaneous, and an
          * undocumented bit 0x200, which is present in table 7, but not in 8,
          * plus snapshot mode to disable scan for now */
         mt9v022->chip_control |= 0x10;
         ret = reg_write(icd, MT9V022_CHIP_CONTROL, mt9v022->chip_control);
-        if (ret >= 0)
-                reg_write(icd, MT9V022_READ_MODE, 0x300);
+        if (!ret)
+                ret = reg_write(icd, MT9V022_READ_MODE, 0x300);
 
         /* All defaults */
-        if (ret >= 0)
+        if (!ret)
                 /* AEC, AGC on */
                 ret = reg_set(icd, MT9V022_AEC_AGC_ENABLE, 0x3);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_MAX_TOTAL_SHUTTER_WIDTH, 480);
-        if (ret >= 0)
+        if (!ret)
                 /* default - auto */
                 ret = reg_clear(icd, MT9V022_BLACK_LEVEL_CALIB_CTRL, 1);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_DIGITAL_TEST_PATTERN, 0);
 
-        return ret >= 0 ? 0 : -EIO;
+        return ret;
 }
 
 static int mt9v022_release(struct soc_camera_device *icd)
 {
-        /* Nothing? */
+        struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
+        struct soc_camera_link *icl = mt9v022->client->dev.platform_data;
+
+        if (icl->power)
+                icl->power(&mt9v022->client->dev, 0);
+
         return 0;
 }
 
@@ -352,21 +374,21 @@ static int mt9v022_set_fmt_cap(struct soc_camera_device *icd,
                                         rect->height + icd->y_skip_top + 43);
         }
         /* Setup frame format: defaults apart from width and height */
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_COLUMN_START, rect->left);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_ROW_START, rect->top);
-        if (ret >= 0)
+        if (!ret)
                 /* Default 94, Phytec driver says:
                  * "width + horizontal blank >= 660" */
                 ret = reg_write(icd, MT9V022_HORIZONTAL_BLANKING,
                                 rect->width > 660 - 43 ? 43 :
                                 660 - rect->width);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_VERTICAL_BLANKING, 45);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_WINDOW_WIDTH, rect->width);
-        if (ret >= 0)
+        if (!ret)
                 ret = reg_write(icd, MT9V022_WINDOW_HEIGHT,
                                 rect->height + icd->y_skip_top);
 
@@ -717,7 +739,7 @@ static int mt9v022_video_probe(struct soc_camera_device *icd)
                         icd->num_formats = 1;
         }
 
-        if (ret >= 0)
+        if (!ret)
                 ret = soc_camera_video_start(icd);
         if (ret < 0)
                 goto eisis;