Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd6f86af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v4.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 - vb2: fix a vb2_thread regression and DVB read() breakages
 - vsp1: fix compilation and links creation
 - s5k6a3: Fix VIDIOC_SUBDEV_G_FMT ioctl for TRY format
 - exynos4-is: fix a build issue, format negotiation and sensor detection
 - Fix a regression with pvrusb2 and ir-kbd-i2c
 - atmel-isi: fix debug message which only show the first format
 - tda1004x: fix a tuning bug if G_PROPERTY is called too early
 - saa7134-alsa: fix a bug at device unbinding/driver removal
 - Fix build of one driver if !HAS_DMA
 - soc_camera: cleanup control device on async_unbind

* tag 'media/v4.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] saa7134-alsa: Only frees registered sound cards
  [media] vb2-core: call threadio->fnc() if !VB2_BUF_STATE_ERROR
  [media] vb2: fix nasty vb2_thread regression
  [media] tda1004x: only update the frontend properties if locked
  [media] media: i2c: Don't export ir-kbd-i2c module alias
  [media] exynos4-is: make VIDEO_SAMSUNG_EXYNOS4_IS tristate
  [media] media: Kconfig: add dependency of HAS_DMA
  [media] exynos4-is: Wait for 100us before opening sensor
  [media] exynos4-is: Open shouldn't fail when sensor entity is not linked
  [media] s5k6a3: Fix VIDIOC_SUBDEV_G_FMT ioctl for TRY format
  [media] exynos4-is: fix a format string bug
  [media] drivers/media: vsp1_video: fix compile error
  [media] atmel-isi: fix debug message which only show the first format
  [media] soc_camera: cleanup control device on async_unbind
  [media] v4l: vsp1: Fix wrong entities links creation
parents ea5a273c ac75fe5d

drivers/media/dvb-frontends/tda1004x.c

+9 −0
Original line number Diff line number Diff line
@@ -903,9 +903,18 @@ static int tda1004x_get_fe(struct dvb_frontend *fe) 
{

	struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache;

	struct tda1004x_state* state = fe->demodulator_priv;

	int status;



	dprintk("%s\n", __func__);



	status = tda1004x_read_byte(state, TDA1004X_STATUS_CD);

	if (status == -1)

		return -EIO;



	/* Only update the properties cache if device is locked */

	if (!(status & 8))

		return 0;



	// inversion status

	fe_params->inversion = INVERSION_OFF;

	if (tda1004x_read_byte(state, TDA1004X_CONFC1) & 0x20)

drivers/media/i2c/ir-kbd-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -478,7 +478,6 @@ static const struct i2c_device_id ir_kbd_id[] = { 
	{ "ir_rx_z8f0811_hdpvr", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, ir_kbd_id);



static struct i2c_driver ir_kbd_driver = {

	.driver = {

drivers/media/i2c/s5k6a3.c

+1 −2
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static int s5k6a3_set_fmt(struct v4l2_subdev *sd, 
	mf = __s5k6a3_get_format(sensor, cfg, fmt->pad, fmt->which);

	if (mf) {

		mutex_lock(&sensor->lock);

		if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE)

		*mf = fmt->format;

		mutex_unlock(&sensor->lock);

	}

drivers/media/pci/saa7134/saa7134-alsa.c

+4 −1
Original line number Diff line number Diff line
@@ -1211,6 +1211,8 @@ static int alsa_device_init(struct saa7134_dev *dev) 


static int alsa_device_exit(struct saa7134_dev *dev)

{

	if (!snd_saa7134_cards[dev->nr])

		return 1;



	snd_card_free(snd_saa7134_cards[dev->nr]);

	snd_saa7134_cards[dev->nr] = NULL;
@@ -1260,6 +1262,7 @@ static void saa7134_alsa_exit(void) 
	int idx;



	for (idx = 0; idx < SNDRV_CARDS; idx++) {

		if (snd_saa7134_cards[idx])

			snd_card_free(snd_saa7134_cards[idx]);

	}

drivers/media/platform/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC 
config VIDEO_STI_BDISP

	tristate "STMicroelectronics BDISP 2D blitter driver"

	depends on VIDEO_DEV && VIDEO_V4L2

	depends on HAS_DMA

	depends on ARCH_STI || COMPILE_TEST

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV