[media] smiapp: Use I2C adapter ID and address in the sub-device name
authorSakari Ailus <sakari.ailus@linux.intel.com>
Wed, 26 Mar 2014 16:34:29 +0000 (13:34 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Wed, 23 Apr 2014 14:11:43 +0000 (11:11 -0300)
The sub-device names should be unique. Should two identical sensors be
present in the same media device they would be indistinguishable. The names
will change e.g. from "vs6555 pixel array" to "vs6555 1-0010 pixel array".

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/i2c/smiapp/smiapp-core.c

index 8741cae..69c11ec 100644 (file)
@@ -2543,8 +2543,9 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
                }
 
                snprintf(this->sd.name,
-                        sizeof(this->sd.name), "%s %s",
-                        sensor->minfo.name, _this->name);
+                        sizeof(this->sd.name), "%s %d-%4.4x %s",
+                        sensor->minfo.name, i2c_adapter_id(client->adapter),
+                        client->addr, _this->name);
 
                this->sink_fmt.width =
                        sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;