Commit 4a0929b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media fixes from Mauro Carvalho Chehab:
 "Some fixes related to the IPU6 driver"

* tag 'media/v6.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: ivsc: Depend on IPU_BRIDGE or not IPU_BRIDGE
  media: intel/ipu6: Fix a null pointer dereference in ipu6_isys_query_stream_by_source
  media: ipu6: Use the ISYS auxdev device as the V4L2 device's device
parents e9d22f7a fd404435

drivers/media/pci/intel/ipu6/ipu6-isys-video.c

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ ipu6_isys_query_stream_by_source(struct ipu6_isys *isys, int source, u8 vc) 
		return NULL;



	if (source < 0) {

		dev_err(&stream->isys->adev->auxdev.dev,

		dev_err(&isys->adev->auxdev.dev,

			"query stream with invalid port number\n");

		return NULL;

	}

drivers/media/pci/intel/ipu6/ipu6-isys.c

+1 −1
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ static int isys_register_devices(struct ipu6_isys *isys) 
	isys->v4l2_dev.mdev = &isys->media_dev;

	isys->v4l2_dev.ctrl_handler = NULL;



	ret = v4l2_device_register(&pdev->dev, &isys->v4l2_dev);

	ret = v4l2_device_register(dev, &isys->v4l2_dev);

	if (ret < 0)

		goto out_media_device_unregister;

drivers/media/pci/intel/ivsc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
config INTEL_VSC

	tristate "Intel Visual Sensing Controller"

	depends on INTEL_MEI && ACPI && VIDEO_DEV

	depends on IPU_BRIDGE || !IPU_BRIDGE

	select MEDIA_CONTROLLER

	select VIDEO_V4L2_SUBDEV_API

	select V4L2_FWNODE