diff for duplicates of <3510938.0mOMoKdDfm@avalon> diff --git a/a/1.txt b/N1/1.txt index 9dbb1e1..e9615b7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -80,14 +80,14 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > +{ > + struct i2c_client *client = i2c_verify_client(dev); > + return client && -> + asd->bus_type = V4L2_ASYNC_BUS_I2C && -> + asd->match.i2c.adapter_id = client->adapter->nr && -> + asd->match.i2c.address = client->addr; +> + asd->bus_type == V4L2_ASYNC_BUS_I2C && +> + asd->match.i2c.adapter_id == client->adapter->nr && +> + asd->match.i2c.address == client->addr; > +} > + > +static bool match_platform(struct device *dev, struct v4l2_async_subdev > *asd) +{ -> + return asd->bus_type = V4L2_ASYNC_BUS_PLATFORM && +> + return asd->bus_type == V4L2_ASYNC_BUS_PLATFORM && > + !strcmp(asd->match.platform.name, dev_name(dev)); > +} > + diff --git a/a/content_digest b/N1/content_digest index f4b633e..90442f4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01371236911-15131-17-git-send-email-g.liakhovetski@gmx.de\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v11 16/21] V4L2: support asynchronous subdevice registration\0" - "Date\0Fri, 21 Jun 2013 16:22:03 +0000\0" + "Date\0Fri, 21 Jun 2013 18:22:03 +0200\0" "To\0Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" "Cc\0linux-media@vger.kernel.org" Sylwester Nawrocki <s.nawrocki@samsung.com> @@ -96,14 +96,14 @@ "> +{\n" "> +\tstruct i2c_client *client = i2c_verify_client(dev);\n" "> +\treturn client &&\n" - "> +\t\tasd->bus_type = V4L2_ASYNC_BUS_I2C &&\n" - "> +\t\tasd->match.i2c.adapter_id = client->adapter->nr &&\n" - "> +\t\tasd->match.i2c.address = client->addr;\n" + "> +\t\tasd->bus_type == V4L2_ASYNC_BUS_I2C &&\n" + "> +\t\tasd->match.i2c.adapter_id == client->adapter->nr &&\n" + "> +\t\tasd->match.i2c.address == client->addr;\n" "> +}\n" "> +\n" "> +static bool match_platform(struct device *dev, struct v4l2_async_subdev\n" "> *asd) +{\n" - "> +\treturn asd->bus_type = V4L2_ASYNC_BUS_PLATFORM &&\n" + "> +\treturn asd->bus_type == V4L2_ASYNC_BUS_PLATFORM &&\n" "> +\t\t!strcmp(asd->match.platform.name, dev_name(dev));\n" "> +}\n" "> +\n" @@ -494,4 +494,4 @@ "\n" Laurent Pinchart -2ce1880636f3e1866d6f7a690fca2beff9b61cafdfcfca733a3dfaf456ba2c96 +ef1a072839a7066dce9620b9783a69db356e5700efdbc050139f9e9c1ae52585
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.