]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
[media] cx231xx: give each master i2c bus a seperate name
authorMatthias Schwarzott <zzam@gentoo.org>
Thu, 2 Oct 2014 05:20:56 +0000 (02:20 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 30 Oct 2014 19:12:21 +0000 (17:12 -0200)
Instead of using the same name for all 3 i2c physical buses
inside cx231xx, name them differently, adding a number
to it. This helps to better deal with the logs.

[mchehab@osg.samsung.com: removed an unused bus_name var from
 the original patch]
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/cx231xx/cx231xx-i2c.c

index a30d40082e5de095b6fd7f2122a1dea98a8e72d0..45057167227c37d5c0a99e404613b93746df39c6 100644 (file)
@@ -512,7 +512,7 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
        bus->i2c_adap = cx231xx_adap_template;
        bus->i2c_adap.dev.parent = &dev->udev->dev;
 
-       strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
+       snprintf(bus->i2c_adap.name, sizeof(bus->i2c_adap.name), "%s-%d", bus->dev->name, bus->nr);
 
        bus->i2c_adap.algo_data = bus;
        i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);