Commit 9e0ee0c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media fixes from Mauro Carvalho Chehab:

 - some warning fixes

 - verisilicon: an excessive usage of stack fix and changes at reg
   access

 - amphion: use dev_err_probe

 - pulse8-cec: handle possible ping error

 - imx-jpeg: Support to assign slot for encoder/decoder

 - amphion: Fix firmware path to match linux-firmware

 - pci: cx23885: fix error handling for cx23885 ATSC boards

 - staging: atomisp: select V4L2_FWNODE

 - mediatek: vcodec: fix cancel_work_sync fail with fluster test

* tag 'media/v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: verisilicon: change confusingly named relaxed register access
  media: verisilicon: fix excessive stack usage
  media: mediatek: vcodec: fix cancel_work_sync fail with fluster test
  media: pci: cx23885: fix error handling for cx23885 ATSC boards
  media: pulse8-cec: handle possible ping error
  media: mtk_jpeg_core: avoid unused-variable warning
  media: imx-jpeg: Support to assign slot for encoder/decoder
  media: amphion: Fix firmware path to match linux-firmware
  media: amphion: use dev_err_probe
  media: staging: atomisp: select V4L2_FWNODE
  media: tc358746: Address compiler warnings
parents 0a9266b7 0cb1d9c8

drivers/media/cec/usb/pulse8/pulse8-cec.c

+5 −2
Original line number Diff line number Diff line
@@ -809,8 +809,11 @@ static void pulse8_ping_eeprom_work_handler(struct work_struct *work) 


	mutex_lock(&pulse8->lock);

	cmd = MSGCODE_PING;

	pulse8_send_and_wait(pulse8, &cmd, 1,

			     MSGCODE_COMMAND_ACCEPTED, 0);

	if (pulse8_send_and_wait(pulse8, &cmd, 1,

				 MSGCODE_COMMAND_ACCEPTED, 0)) {

		dev_warn(pulse8->dev, "failed to ping EEPROM\n");

		goto unlock;

	}



	if (pulse8->vers < 2)

		goto unlock;

drivers/media/i2c/tc358746.c

+2 −2
Original line number Diff line number Diff line
@@ -813,8 +813,8 @@ static unsigned long tc358746_find_pll_settings(struct tc358746 *tc358746, 
	u32 min_delta = 0xffffffff;

	u16 prediv_max = 17;

	u16 prediv_min = 1;

	u16 m_best, mul;

	u16 p_best, p;

	u16 m_best = 0, mul;

	u16 p_best = 1, p;

	u8 postdiv;



	if (fout > 1000 * HZ_PER_MHZ) {

drivers/media/pci/cx23885/cx23885-dvb.c

+0 −12
Original line number Diff line number Diff line
@@ -2459,16 +2459,10 @@ static int dvb_register(struct cx23885_tsport *port) 
			request_module("%s", info.type);

			client_tuner = i2c_new_client_device(&dev->i2c_bus[1].i2c_adap, &info);

			if (!i2c_client_has_driver(client_tuner)) {

				module_put(client_demod->dev.driver->owner);

				i2c_unregister_device(client_demod);

				port->i2c_client_demod = NULL;

				goto frontend_detach;

			}

			if (!try_module_get(client_tuner->dev.driver->owner)) {

				i2c_unregister_device(client_tuner);

				module_put(client_demod->dev.driver->owner);

				i2c_unregister_device(client_demod);

				port->i2c_client_demod = NULL;

				goto frontend_detach;

			}

			port->i2c_client_tuner = client_tuner;
@@ -2505,16 +2499,10 @@ static int dvb_register(struct cx23885_tsport *port) 
			request_module("%s", info.type);

			client_tuner = i2c_new_client_device(&dev->i2c_bus[1].i2c_adap, &info);

			if (!i2c_client_has_driver(client_tuner)) {

				module_put(client_demod->dev.driver->owner);

				i2c_unregister_device(client_demod);

				port->i2c_client_demod = NULL;

				goto frontend_detach;

			}

			if (!try_module_get(client_tuner->dev.driver->owner)) {

				i2c_unregister_device(client_tuner);

				module_put(client_demod->dev.driver->owner);

				i2c_unregister_device(client_demod);

				port->i2c_client_demod = NULL;

				goto frontend_detach;

			}

			port->i2c_client_tuner = client_tuner;

drivers/media/platform/amphion/vpu_core.c

+2 −2
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ static const struct dev_pm_ops vpu_core_pm_ops = { 


static struct vpu_core_resources imx8q_enc = {

	.type = VPU_CORE_TYPE_ENC,

	.fwname = "vpu/vpu_fw_imx8_enc.bin",

	.fwname = "amphion/vpu/vpu_fw_imx8_enc.bin",

	.stride = 16,

	.max_width = 1920,

	.max_height = 1920,
@@ -841,7 +841,7 @@ static struct vpu_core_resources imx8q_enc = { 


static struct vpu_core_resources imx8q_dec = {

	.type = VPU_CORE_TYPE_DEC,

	.fwname = "vpu/vpu_fw_imx8_dec.bin",

	.fwname = "amphion/vpu/vpu_fw_imx8_dec.bin",

	.stride = 256,

	.max_width = 8188,

	.max_height = 8188,

drivers/media/platform/amphion/vpu_mbox.c

+4 −5
Original line number Diff line number Diff line
@@ -46,11 +46,10 @@ static int vpu_mbox_request_channel(struct device *dev, struct vpu_mbox *mbox) 
	cl->rx_callback = vpu_mbox_rx_callback;



	ch = mbox_request_channel_byname(cl, mbox->name);

	if (IS_ERR(ch)) {

		dev_err(dev, "Failed to request mbox chan %s, ret : %ld\n",

			mbox->name, PTR_ERR(ch));

		return PTR_ERR(ch);

	}

	if (IS_ERR(ch))

		return dev_err_probe(dev, PTR_ERR(ch),

				     "Failed to request mbox chan %s\n",

				     mbox->name);



	mbox->ch = ch;

	return 0;