Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / media / video / em28xx / em28xx-core.c

diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 079ab4d..5b78e19 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -648,28 +648,17 @@ int em28xx_capture_start(struct em28xx *dev, int start)
 int em28xx_set_outfmt(struct em28xx *dev)
 {
        int ret;
-       int vinmode, vinctl, outfmt;
-
-       outfmt  = dev->format->reg;
-
-       if (dev->board.is_27xx) {
-               vinmode = 0x0d;
-               vinctl  = 0x00;
-       } else {
-               vinmode = 0x10;
-               vinctl  = 0x11;
-       }
 
        ret = em28xx_write_reg_bits(dev, EM28XX_R27_OUTFMT,
-                               outfmt | 0x20, 0xff);
+                               dev->format->reg | 0x20, 0xff);
        if (ret < 0)
                        return ret;
 
-       ret = em28xx_write_reg(dev, EM28XX_R10_VINMODE, vinmode);
+       ret = em28xx_write_reg(dev, EM28XX_R10_VINMODE, dev->vinmode);
        if (ret < 0)
                return ret;
 
-       return em28xx_write_reg(dev, EM28XX_R11_VINCTRL, vinctl);
+       return em28xx_write_reg(dev, EM28XX_R11_VINCTRL, dev->vinctl);
 }
 
 static int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax,
@@ -707,10 +696,7 @@ static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v)
        u8 mode;
        /* the em2800 scaler only supports scaling down to 50% */
 
-       if (dev->board.is_27xx) {
-               /* FIXME: Don't use the scaler yet */
-               mode = 0;
-       } else if (dev->board.is_em2800) {
+       if (dev->board.is_em2800) {
                mode = (v ? 0x20 : 0x00) | (h ? 0x10 : 0x00);
        } else {
                u8 buf[2];