summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-09-07 13:32:44 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 13:37:00 +0200
commit9ebeae5641b141a71ed442e9fcb4993f6c0cd04f (patch)
tree9e71fc7dd87a65ba531c505f4c458da9b94308f4 /drivers/media
parentV4L/DVB (8944): saa5249: convert i2c driver for new i2c API (diff)
downloadlinux-9ebeae5641b141a71ed442e9fcb4993f6c0cd04f.tar.xz
linux-9ebeae5641b141a71ed442e9fcb4993f6c0cd04f.zip
V4L/DVB (8945): mxb: use unique i2c adapter name
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/mxb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index b2dae5062e65..7f130284b5c7 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -215,9 +215,10 @@ static int mxb_probe(struct saa7146_dev* dev)
mxb->i2c_adapter = (struct i2c_adapter) {
.class = I2C_CLASS_TV_ANALOG,
- .name = "mxb",
};
+ snprintf(mxb->i2c_adapter.name, sizeof(mxb->i2c_adapter.name), "mxb%d", mxb_num);
+
saa7146_i2c_adapter_prepare(dev, &mxb->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
if(i2c_add_adapter(&mxb->i2c_adapter) < 0) {
DEB_S(("cannot register i2c-device. skipping.\n"));