diff options
| author | Andy Walls <awalls@radix.net> | 2009-02-14 15:08:37 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:01 -0400 |
| commit | 5811cf99df2e3c102055be3ea77508e56c9f77c6 (patch) | |
| tree | 75be74b5072280edadeee2c1f6c42f5e961c208c /drivers/media/video/cx18/cx18-i2c.c | |
| parent | 1a2670465ec94029e5df62e3decca9e2f7aea075 (diff) | |
V4L/DVB (10756): cx18: Slim down instance handling, build names from v4l2_device.name
Convert card instance handling to a lighter weight mechanism like ivtv.
Also convert name strings and debug messages to use v4l2_device.name.
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-i2c.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c index 200d9257a926..db2c3e6997d0 100644 --- a/drivers/media/video/cx18/cx18-i2c.c +++ b/drivers/media/video/cx18/cx18-i2c.c | |||
| @@ -358,7 +358,7 @@ int init_cx18_i2c(struct cx18 *cx) | |||
| 358 | cx->i2c_adap[i].algo_data = &cx->i2c_algo[i]; | 358 | cx->i2c_adap[i].algo_data = &cx->i2c_algo[i]; |
| 359 | 359 | ||
| 360 | sprintf(cx->i2c_adap[i].name + strlen(cx->i2c_adap[i].name), | 360 | sprintf(cx->i2c_adap[i].name + strlen(cx->i2c_adap[i].name), |
| 361 | " #%d-%d", cx->num, i); | 361 | " #%d-%d", cx->instance, i); |
| 362 | i2c_set_adapdata(&cx->i2c_adap[i], cx); | 362 | i2c_set_adapdata(&cx->i2c_adap[i], cx); |
| 363 | 363 | ||
| 364 | memcpy(&cx->i2c_client[i], &cx18_i2c_client_template, | 364 | memcpy(&cx->i2c_client[i], &cx18_i2c_client_template, |