Am 22.03.2014 14:01, schrieb Frank Schäfer:
> em28xx_compression_disable() is a single line function which is called only
> one
> time and this call also isn't needed.
> Register 0x26 is always configured as part of the scaler configuration, which
> in turn is always done when the resolution changes. And the initial resolution
> setting is applied at first device open.
>
> Signed-off-by: Frank Schäfer <fschaefer....@googlemail.com>
> ---
> drivers/media/usb/em28xx/em28xx-video.c | 1 -
> drivers/media/usb/em28xx/em28xx.h | 6 ------
> 2 files changed, 7 deletions(-)
>
> diff --git a/drivers/media/usb/em28xx/em28xx-video.c
> b/drivers/media/usb/em28xx/em28xx-video.c
> index 0856e5d..e15ac75 100644
> --- a/drivers/media/usb/em28xx/em28xx-video.c
> +++ b/drivers/media/usb/em28xx/em28xx-video.c
> @@ -2376,7 +2376,6 @@ static int em28xx_v4l2_init(struct em28xx *dev)
> (EM28XX_XCLK_AUDIO_UNMUTE | val));
>
> em28xx_set_outfmt(dev);
> - em28xx_compression_disable(dev);
>
> /* Add image controls */
> /* NOTE: at this point, the subdevices are already registered, so bridge
> diff --git a/drivers/media/usb/em28xx/em28xx.h
> b/drivers/media/usb/em28xx/em28xx.h
> index e95f4eb..dd6190c 100644
> --- a/drivers/media/usb/em28xx/em28xx.h
> +++ b/drivers/media/usb/em28xx/em28xx.h
> @@ -793,12 +793,6 @@ int em28xx_init_camera(struct em28xx *dev);
> printk(KERN_WARNING "%s: "fmt,\
> dev->name , ##arg); } while (0)
>
> -static inline int em28xx_compression_disable(struct em28xx *dev)
> -{
> - /* side effect of disabling scaler and mixer */
> - return em28xx_write_reg(dev, EM28XX_R26_COMPR, 0x00);
> -}
> -
> /*FIXME: maxw should be dependent of alt mode */
> static inline unsigned int norm_maxw(struct em28xx *dev)
> {
Please disregard this patch, I will send an updated version in a minute.
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
