From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 7 Sep 2008 11:32:44 +0000 (-0300)
Subject: V4L/DVB (8945): mxb: use unique i2c adapter name
X-Git-Tag: v2.6.28-rc1~601^2~183
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9ebeae5641b141a71ed442e9fcb4993f6c0cd04f;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index b2dae5062e6..7f130284b5c 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"));