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

Commit 8c755c29 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'fixes' into patchwork 

Some macros were changed/removed at the material for v4.5. We need
to sync with those changes here, in order to avoid troubles.

* v4l_for_linus:
  [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 360104e3 9727a954

drivers/media/i2c/adp1653.c

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

		if (!client->dev.platform_data) {

			dev_err(&client->dev,

			dev_err(&client->dev,

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

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

			return EINVAL;

			return -EINVAL;

		}

		}

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

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

	}

	}

drivers/staging/media/davinci_vpfe/vpfe_video.c

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

	mutex_lock(&mdev->graph_mutex);

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

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

	if (ret) {

	if (ret) {

		mutex_unlock(&video->lock);

		mutex_unlock(&mdev->graph_mutex);

		return -ENOMEM;

		return -ENOMEM;

	}

	}

	media_entity_graph_walk_start(&graph, entity);

	media_entity_graph_walk_start(&graph, entity);

include/uapi/linux/media.h

+13 −13
Original line number Original line Diff line number Diff line
@@ -71,20 +71,12 @@ struct media_device_info { 
#define MEDIA_ENT_F_DTV_CA		(MEDIA_ENT_F_BASE + 3)

#define MEDIA_ENT_F_DTV_CA		(MEDIA_ENT_F_BASE + 3)

#define MEDIA_ENT_F_DTV_NET_DECAP	(MEDIA_ENT_F_BASE + 4)

#define MEDIA_ENT_F_DTV_NET_DECAP	(MEDIA_ENT_F_BASE + 4)





/*

 * Connectors

 */

/* It is a responsibility of the entity drivers to add connectors and links */

#define MEDIA_ENT_F_CONN_RF		(MEDIA_ENT_F_BASE + 21)

#define MEDIA_ENT_F_CONN_SVIDEO		(MEDIA_ENT_F_BASE + 22)

#define MEDIA_ENT_F_CONN_COMPOSITE	(MEDIA_ENT_F_BASE + 23)



/*

/*

 * I/O entities

 * I/O entities

 */

 */

#define MEDIA_ENT_F_IO_DTV  		(MEDIA_ENT_F_BASE + 31)

#define MEDIA_ENT_F_IO_DTV		(MEDIA_ENT_F_BASE + 1001)

#define MEDIA_ENT_F_IO_VBI  		(MEDIA_ENT_F_BASE + 32)

#define MEDIA_ENT_F_IO_VBI		(MEDIA_ENT_F_BASE + 1002)

#define MEDIA_ENT_F_IO_SWRADIO		(MEDIA_ENT_F_BASE + 33)

#define MEDIA_ENT_F_IO_SWRADIO		(MEDIA_ENT_F_BASE + 1003)





/*

/*

 * Analog TV IF-PLL decoders

 * Analog TV IF-PLL decoders
@@ -92,8 +84,16 @@ struct media_device_info { 
 * It is a responsibility of the master/bridge drivers to create links

 * It is a responsibility of the master/bridge drivers to create links

 * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.

 * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.

 */

 */

#define MEDIA_ENT_F_IF_VID_DECODER	(MEDIA_ENT_F_BASE + 41)

#define MEDIA_ENT_F_IF_VID_DECODER	(MEDIA_ENT_F_BASE + 2001)

#define MEDIA_ENT_F_IF_AUD_DECODER	(MEDIA_ENT_F_BASE + 42)

#define MEDIA_ENT_F_IF_AUD_DECODER	(MEDIA_ENT_F_BASE + 2002)



/*

 * Connectors

 */

/* It is a responsibility of the entity drivers to add connectors and links */

#define MEDIA_ENT_F_CONN_RF		(MEDIA_ENT_F_BASE + 10001)

#define MEDIA_ENT_F_CONN_SVIDEO		(MEDIA_ENT_F_BASE + 10002)

#define MEDIA_ENT_F_CONN_COMPOSITE	(MEDIA_ENT_F_BASE + 10003)





/*

/*

 * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and

 * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and