diff options
Diffstat (limited to 'drivers/media/video/tda7432.c')
-rw-r--r-- | drivers/media/video/tda7432.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c index 255b6088ebf9..d32737dd2142 100644 --- a/drivers/media/video/tda7432.c +++ b/drivers/media/video/tda7432.c | |||
@@ -50,7 +50,6 @@ | |||
50 | 50 | ||
51 | #include "bttv.h" | 51 | #include "bttv.h" |
52 | #include <media/audiochip.h> | 52 | #include <media/audiochip.h> |
53 | #include <media/id.h> | ||
54 | 53 | ||
55 | #ifndef VIDEO_AUDIO_BALANCE | 54 | #ifndef VIDEO_AUDIO_BALANCE |
56 | # define VIDEO_AUDIO_BALANCE 32 | 55 | # define VIDEO_AUDIO_BALANCE 32 |
@@ -310,9 +309,9 @@ static int tda7432_attach(struct i2c_adapter *adap, int addr, int kind) | |||
310 | memset(t,0,sizeof *t); | 309 | memset(t,0,sizeof *t); |
311 | 310 | ||
312 | client = &t->c; | 311 | client = &t->c; |
313 | memcpy(client,&client_template,sizeof(struct i2c_client)); | 312 | memcpy(client,&client_template,sizeof(struct i2c_client)); |
314 | client->adapter = adap; | 313 | client->adapter = adap; |
315 | client->addr = addr; | 314 | client->addr = addr; |
316 | i2c_set_clientdata(client, t); | 315 | i2c_set_clientdata(client, t); |
317 | 316 | ||
318 | do_tda7432_init(client); | 317 | do_tda7432_init(client); |
@@ -472,7 +471,7 @@ static int tda7432_command(struct i2c_client *client, | |||
472 | } | 471 | } |
473 | } | 472 | } |
474 | 473 | ||
475 | t->muted=(va->flags & VIDEO_AUDIO_MUTE); | 474 | t->muted=(va->flags & VIDEO_AUDIO_MUTE); |
476 | if (t->muted) | 475 | if (t->muted) |
477 | { | 476 | { |
478 | /* Mute & update balance*/ | 477 | /* Mute & update balance*/ |
@@ -503,12 +502,12 @@ static int tda7432_command(struct i2c_client *client, | |||
503 | 502 | ||
504 | static struct i2c_driver driver = { | 503 | static struct i2c_driver driver = { |
505 | .owner = THIS_MODULE, | 504 | .owner = THIS_MODULE, |
506 | .name = "i2c tda7432 driver", | 505 | .name = "i2c tda7432 driver", |
507 | .id = I2C_DRIVERID_TDA7432, | 506 | .id = I2C_DRIVERID_TDA7432, |
508 | .flags = I2C_DF_NOTIFY, | 507 | .flags = I2C_DF_NOTIFY, |
509 | .attach_adapter = tda7432_probe, | 508 | .attach_adapter = tda7432_probe, |
510 | .detach_client = tda7432_detach, | 509 | .detach_client = tda7432_detach, |
511 | .command = tda7432_command, | 510 | .command = tda7432_command, |
512 | }; | 511 | }; |
513 | 512 | ||
514 | static struct i2c_client client_template = | 513 | static struct i2c_client client_template = |