diff --git a/[refs] b/[refs] index 27ff3829bfd3..6f02e36e6709 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96af9880c0d38fa6f331d1dd4cd39c5f5227fbbf +refs/heads/master: 9ebeae5641b141a71ed442e9fcb4993f6c0cd04f diff --git a/trunk/drivers/media/video/mxb.c b/trunk/drivers/media/video/mxb.c index b2dae5062e65..7f130284b5c7 100644 --- a/trunk/drivers/media/video/mxb.c +++ b/trunk/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"));