tree-wide: fix assorted typos all over the place

[linux-2.6-microblaze.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 1be3881..c217441 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -29,7 +29,6 @@
 #include <linux/bitmap.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
-#include <linux/version.h>
 #include <linux/mm.h>
 #include <linux/mutex.h>
 
@@ -1053,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);
 }
 
 /******************************************************************************
@@ -2056,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;
 
@@ -2424,9 +2414,11 @@ int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev)
                cx231xx_info("No ACK after %d msec -GPIO I2C failed!",
                             nInit * 10);
 
-       /* readAck
-          throuth clock stretch ,slave has given a SCL signal,
-          so the SDA data can be directly read.  */
+       /*
+        * readAck
+        * through clock stretch, slave has given a SCL signal,
+        * so the SDA data can be directly read.
+        */
        status = cx231xx_get_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
 
        if ((dev->gpio_val & 1 << dev->board.tuner_sda_gpio) == 0) {