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

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

Pull media fixes from Mauro Carvalho Chehab:

 - dvb-usb-firmware: don't do DMA on stack

 - coda/imx-vdoa: platform_driver should not be const

 - bdisp: Clean up file handle in open() error path

 - exynos-gsc: Do not swap cb/cr for semi planar formats

* tag 'media/v4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] exynos-gsc: Do not swap cb/cr for semi planar formats
  [media] bdisp: Clean up file handle in open() error path
  [media] coda/imx-vdoa: platform_driver should not be const
  [media] dvb-usb-firmware: don't do DMA on stack
parents 86b7eab2 24a47426

drivers/media/platform/coda/imx-vdoa.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static const struct of_device_id vdoa_dt_ids[] = { 
};

MODULE_DEVICE_TABLE(of, vdoa_dt_ids);



static const struct platform_driver vdoa_driver = {

static struct platform_driver vdoa_driver = {

	.probe		= vdoa_probe,

	.remove		= vdoa_remove,

	.driver		= {

drivers/media/platform/exynos-gsc/gsc-core.c

+0 −2
Original line number Diff line number Diff line
@@ -861,9 +861,7 @@ int gsc_prepare_addr(struct gsc_ctx *ctx, struct vb2_buffer *vb, 


	if ((frame->fmt->pixelformat == V4L2_PIX_FMT_VYUY) ||

		(frame->fmt->pixelformat == V4L2_PIX_FMT_YVYU) ||

		(frame->fmt->pixelformat == V4L2_PIX_FMT_NV61) ||

		(frame->fmt->pixelformat == V4L2_PIX_FMT_YVU420) ||

		(frame->fmt->pixelformat == V4L2_PIX_FMT_NV21) ||

		(frame->fmt->pixelformat == V4L2_PIX_FMT_YVU420M))

		swap(addr->cb, addr->cr);

drivers/media/platform/sti/bdisp/bdisp-v4l2.c

+1 −1
Original line number Diff line number Diff line
@@ -632,8 +632,8 @@ static int bdisp_open(struct file *file) 


error_ctrls:

	bdisp_ctrls_delete(ctx);

error_fh:

	v4l2_fh_del(&ctx->fh);

error_fh:

	v4l2_fh_exit(&ctx->fh);

	bdisp_hw_free_nodes(ctx);

mem_ctx:

drivers/media/usb/dvb-usb/dvb-usb-firmware.c

+12 −10
Original line number Diff line number Diff line
@@ -36,16 +36,18 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le 
int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)

{

	struct hexline *hx;

	u8 reset;

	u8 *buf;

	int ret, pos = 0;

	u16 cpu_cs_register = cypress[type].cpu_cs_register;



	hx = kmalloc(sizeof(*hx), GFP_KERNEL);

	if (!hx)

	buf = kmalloc(sizeof(*hx), GFP_KERNEL);

	if (!buf)

		return -ENOMEM;

	hx = (struct hexline *)buf;



	/* stop the CPU */

	reset = 1;

	if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)

	buf[0] = 1;

	if (usb_cypress_writemem(udev, cpu_cs_register, buf, 1) != 1)

		err("could not stop the USB controller CPU.");



	while ((ret = dvb_usb_get_hexline(fw, hx, &pos)) > 0) {
@@ -61,21 +63,21 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw 
	}

	if (ret < 0) {

		err("firmware download failed at %d with %d",pos,ret);

		kfree(hx);

		kfree(buf);

		return ret;

	}



	if (ret == 0) {

		/* restart the CPU */

		reset = 0;

		if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {

		buf[0] = 0;

		if (usb_cypress_writemem(udev, cpu_cs_register, buf, 1) != 1) {

			err("could not restart the USB controller CPU.");

			ret = -EINVAL;

		}

	} else

		ret = -EIO;



	kfree(hx);

	kfree(buf);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE