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

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

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

Pull media fixes from Mauro Carvalho Chehab:
  - some last time changes before we stablize the new entity function
    integer numbers at uAPI
  - probe: fix erroneous return value on i2c/adp1653 driver
  - fix tx 5v detect regression on adv7604 driver
  - fix missing unlock on error in vpfe_prepare_pipeline() on
    davinci_vpfe driver

* tag 'media/v4.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] media: Sanitise the reserved fields of the G_TOPOLOGY IOCTL arguments
  [media] media.h: postpone connectors entities
  [media] media.h: use hex values for range offsets,  move connectors base up.
  [media] adv7604: fix tx 5v detect regression
  [media] media.h: get rid of MEDIA_ENT_F_CONN_TEST
  [media] [for,v4.5] media.h: increase the spacing between function ranges
  [media] media: i2c/adp1653: probe: fix erroneous return value
  [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline()
parents a7c9b603 fbe093ac

Documentation/DocBook/media/v4l/media-types.xml

+0 −4
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ 
	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry>Connector for a RGB composite signal.</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>

	    <entry>Connector for a test generator.</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry>Camera video sensor entity.</entry>

drivers/media/i2c/adp1653.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int adp1653_probe(struct i2c_client *client, 
		if (!client->dev.platform_data) {

			dev_err(&client->dev,

				"Neither DT not platform data provided\n");

			return EINVAL;

			return -EINVAL;

		}

		flash->platform_data = client->dev.platform_data;

	}

drivers/media/i2c/adv7604.c

+1 −2
Original line number Diff line number Diff line
@@ -1960,10 +1960,9 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled) 
	}



	/* tx 5v detect */

	tx_5v = io_read(sd, 0x70) & info->cable_det_mask;

	tx_5v = irq_reg_0x70 & info->cable_det_mask;

	if (tx_5v) {

		v4l2_dbg(1, debug, sd, "%s: tx_5v: 0x%x\n", __func__, tx_5v);

		io_write(sd, 0x71, tx_5v);

		adv76xx_s_detect_tx_5v_ctrl(sd);

		if (handled)

			*handled = true;

drivers/media/usb/au0828/au0828-video.c

+1 −2
Original line number Diff line number Diff line
@@ -1843,8 +1843,7 @@ static void au0828_analog_create_entities(struct au0828_dev *dev) 
			ent->function = MEDIA_ENT_F_CONN_RF;

			break;

		default: /* AU0828_VMUX_DEBUG */

			ent->function = MEDIA_ENT_F_CONN_TEST;

			break;

			continue;

		}



		ret = media_entity_pads_init(ent, 1, &dev->input_pad[i]);

drivers/staging/media/davinci_vpfe/vpfe_video.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video) 
	mutex_lock(&mdev->graph_mutex);

	ret = media_entity_graph_walk_init(&graph, entity->graph_obj.mdev);

	if (ret) {

		mutex_unlock(&video->lock);

		mutex_unlock(&mdev->graph_mutex);

		return -ENOMEM;

	}

	media_entity_graph_walk_start(&graph, entity);