diff for duplicates of <2334695.Oz27NUDV2a@avalon> diff --git a/a/1.txt b/N1/1.txt index 11d6b38..3432ce4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,15 +18,15 @@ On Wednesday 19 August 2015 08:01:48 Mauro Carvalho Chehab wrote: > media_device *mdev, u32 id) spin_lock(&mdev->lock); > > media_device_for_each_entity(entity, mdev) { -> - if ((entity->id = id && !next) || +> - if ((entity->id == id && !next) || > - (entity->id > id && next)) { -> + if (((media_entity_id(entity) = id) && !next) || +> + if (((media_entity_id(entity) == id) && !next) || > + ((media_entity_id(entity) > id) && next)) { > spin_unlock(&mdev->lock); > return entity; > } > @@ -104,7 +104,7 @@ static long media_device_enum_entities(struct -> media_device *mdev, if (ent = NULL) +> media_device *mdev, if (ent == NULL) > return -EINVAL; > > - u_ent.id = ent->id; @@ -92,7 +92,7 @@ On Wednesday 19 August 2015 08:01:48 Mauro Carvalho Chehab wrote: > + entities |= 1 << media_entity_id(&entity->subdev.entity); > > /* UDS can't be chained. */ -> if (entity->type = VSP1_ENTITY_UDS) { +> if (entity->type == VSP1_ENTITY_UDS) { I would move the modification of the vsp1 driver to Javier's patch that modifies the OMAP3 and OMAP4 drivers. Alternatively you could squash them into diff --git a/a/content_digest b/N1/content_digest index af6f3a9..81a084d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0132df89d552ddd1f5d91d7ab82cd63d3ed43441a.1439981515.git.mchehab@osg.samsung.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v6 1/8] [media] media: create a macro to get entity ID\0" - "Date\0Fri, 21 Aug 2015 00:40:48 +0000\0" + "Date\0Fri, 21 Aug 2015 03:40:48 +0300\0" "To\0Mauro Carvalho Chehab <mchehab@osg.samsung.com>\0" "Cc\0Linux Media Mailing List <linux-media@vger.kernel.org>" Mauro Carvalho Chehab <mchehab@infradead.org> @@ -29,15 +29,15 @@ "> media_device *mdev, u32 id) spin_lock(&mdev->lock);\n" "> \n" "> \tmedia_device_for_each_entity(entity, mdev) {\n" - "> -\t\tif ((entity->id = id && !next) ||\n" + "> -\t\tif ((entity->id == id && !next) ||\n" "> -\t\t (entity->id > id && next)) {\n" - "> +\t\tif (((media_entity_id(entity) = id) && !next) ||\n" + "> +\t\tif (((media_entity_id(entity) == id) && !next) ||\n" "> +\t\t ((media_entity_id(entity) > id) && next)) {\n" "> \t\t\tspin_unlock(&mdev->lock);\n" "> \t\t\treturn entity;\n" "> \t\t}\n" "> @@ -104,7 +104,7 @@ static long media_device_enum_entities(struct\n" - "> media_device *mdev, if (ent = NULL)\n" + "> media_device *mdev, if (ent == NULL)\n" "> \t\treturn -EINVAL;\n" "> \n" "> -\tu_ent.id = ent->id;\n" @@ -103,7 +103,7 @@ "> +\t\tentities |= 1 << media_entity_id(&entity->subdev.entity);\n" "> \n" "> \t\t/* UDS can't be chained. */\n" - "> \t\tif (entity->type = VSP1_ENTITY_UDS) {\n" + "> \t\tif (entity->type == VSP1_ENTITY_UDS) {\n" "\n" "I would move the modification of the vsp1 driver to Javier's patch that \n" "modifies the OMAP3 and OMAP4 drivers. Alternatively you could squash them into \n" @@ -131,4 +131,4 @@ "\n" Laurent Pinchart -12bba1afa83362c78a9d7529b473ed6b6cff05ca945ab5aa4e99d52737aab9c5 +7cfd45024525ad06c2b0c99473261e3a0283ae982185a746e3c295b88065da1b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.