Merge branch 'power-meter' into release

[mv-sheeva.git] / drivers / media / video / cx231xx / cx231xx-avcore.c

diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 6a9464079b4cf7bb2161f0b1998d421bfbbbbc99..28f48f41f218cf45865f1a5cf730608954a98cce 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -1052,22 +1052,13 @@ int cx231xx_set_audio_decoder_input(struct cx231xx *dev,
 /* Set resolution of the video */
 int cx231xx_resolution_set(struct cx231xx *dev)
 {
-       int width, height;
-       u32 hscale, vscale;
-       int status = 0;
-
-       width = dev->width;
-       height = dev->height;
-
-       get_scale(dev, width, height, &hscale, &vscale);
-
        /* set horzontal scale */
-       status = vid_blk_write_word(dev, HSCALE_CTRL, hscale);
+       int status = vid_blk_write_word(dev, HSCALE_CTRL, dev->hscale);
+       if (status)
+               return status;
 
        /* set vertical scale */
-       status = vid_blk_write_word(dev, VSCALE_CTRL, vscale);
-
-       return status;
+       return vid_blk_write_word(dev, VSCALE_CTRL, dev->vscale);
 }
 
 /******************************************************************************
@@ -2055,7 +2046,7 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type)
 
 int cx231xx_capture_start(struct cx231xx *dev, int start, u8 media_type)
 {
-       int rc;
+       int rc = -1;
        u32 ep_mask = -1;
        struct pcb_config *pcb_config;