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

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

Pull media fixes from Mauro Carvalho Chehab:
 "Three driver fixes"

* tag 'media/v6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: imx: imx7-media-csi: Fix applying format constraints
  media: uvcvideo: Fix menu count handling for userspace XU mappings
  media: mtk-jpeg: Set platform driver data earlier
parents bf98bae3 2908042a

drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1310,6 +1310,8 @@ static int mtk_jpeg_probe(struct platform_device *pdev) 
	jpeg->dev = &pdev->dev;

	jpeg->variant = of_device_get_match_data(jpeg->dev);



	platform_set_drvdata(pdev, jpeg);



	ret = devm_of_platform_populate(&pdev->dev);

	if (ret) {

		v4l2_err(&jpeg->v4l2_dev, "Master of platform populate failed.");
@@ -1381,8 +1383,6 @@ static int mtk_jpeg_probe(struct platform_device *pdev) 
		  jpeg->variant->dev_name, jpeg->vdev->num,

		  VIDEO_MAJOR, jpeg->vdev->minor);



	platform_set_drvdata(pdev, jpeg);



	pm_runtime_enable(&pdev->dev);



	return 0;

drivers/media/platform/nxp/imx7-media-csi.c

+5 −2
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ 
#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/math.h>

#include <linux/mfd/syscon.h>

#include <linux/minmax.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/of_graph.h>
@@ -1137,8 +1139,9 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, 
	 * TODO: Implement configurable stride support.

	 */

	walign = 8 * 8 / cc->bpp;

	v4l_bound_align_image(&pixfmt->width, 1, 0xffff, walign,

			      &pixfmt->height, 1, 0xffff, 1, 0);

	pixfmt->width = clamp(round_up(pixfmt->width, walign), walign,

			      round_down(65535U, walign));

	pixfmt->height = clamp(pixfmt->height, 1U, 65535U);



	pixfmt->bytesperline = pixfmt->width * cc->bpp / 8;

	pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height;

drivers/media/usb/uvc/uvc_v4l2.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int uvc_control_add_xu_mapping(struct uvc_video_chain *chain, 
	map->menu_names = NULL;

	map->menu_mapping = NULL;



	map->menu_mask = BIT_MASK(xmap->menu_count);

	map->menu_mask = GENMASK(xmap->menu_count - 1, 0);



	size = xmap->menu_count * sizeof(*map->menu_mapping);

	map->menu_mapping = kzalloc(size, GFP_KERNEL);