diff options
Diffstat (limited to 'drivers/media/video/vpx3220.c')
-rw-r--r-- | drivers/media/video/vpx3220.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c index 4cd579967487..40b205b91481 100644 --- a/drivers/media/video/vpx3220.c +++ b/drivers/media/video/vpx3220.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * vpx3220a, vpx3216b & vpx3214c video decoder driver version 0.0.1 | 2 | * vpx3220a, vpx3216b & vpx3214c video decoder driver version 0.0.1 |
3 | * | 3 | * |
4 | * Copyright (C) 2001 Laurent Pinchart <lpinchart@freegates.be> | 4 | * Copyright (C) 2001 Laurent Pinchart <lpinchart@freegates.be> |
@@ -176,8 +176,8 @@ vpx3220_write_block (struct i2c_client *client, | |||
176 | 176 | ||
177 | static int | 177 | static int |
178 | vpx3220_write_fp_block (struct i2c_client *client, | 178 | vpx3220_write_fp_block (struct i2c_client *client, |
179 | const u16 *data, | 179 | const u16 *data, |
180 | unsigned int len) | 180 | unsigned int len) |
181 | { | 181 | { |
182 | u8 reg; | 182 | u8 reg; |
183 | int ret = 0; | 183 | int ret = 0; |
@@ -316,7 +316,7 @@ vpx3220_command (struct i2c_client *client, | |||
316 | vpx3220_write_fp_block(client, init_fp, | 316 | vpx3220_write_fp_block(client, init_fp, |
317 | sizeof(init_fp) >> 1); | 317 | sizeof(init_fp) >> 1); |
318 | switch (decoder->norm) { | 318 | switch (decoder->norm) { |
319 | 319 | ||
320 | case VIDEO_MODE_NTSC: | 320 | case VIDEO_MODE_NTSC: |
321 | vpx3220_write_fp_block(client, init_ntsc, | 321 | vpx3220_write_fp_block(client, init_ntsc, |
322 | sizeof(init_ntsc) >> 1); | 322 | sizeof(init_ntsc) >> 1); |
@@ -324,7 +324,7 @@ vpx3220_command (struct i2c_client *client, | |||
324 | 324 | ||
325 | case VIDEO_MODE_PAL: | 325 | case VIDEO_MODE_PAL: |
326 | vpx3220_write_fp_block(client, init_pal, | 326 | vpx3220_write_fp_block(client, init_pal, |
327 | sizeof(init_pal) >> 1); | 327 | sizeof(init_pal) >> 1); |
328 | break; | 328 | break; |
329 | case VIDEO_MODE_SECAM: | 329 | case VIDEO_MODE_SECAM: |
330 | vpx3220_write_fp_block(client, init_secam, | 330 | vpx3220_write_fp_block(client, init_secam, |
@@ -332,10 +332,10 @@ vpx3220_command (struct i2c_client *client, | |||
332 | break; | 332 | break; |
333 | default: | 333 | default: |
334 | vpx3220_write_fp_block(client, init_pal, | 334 | vpx3220_write_fp_block(client, init_pal, |
335 | sizeof(init_pal) >> 1); | 335 | sizeof(init_pal) >> 1); |
336 | break; | 336 | break; |
337 | } | 337 | } |
338 | } | 338 | } |
339 | break; | 339 | break; |
340 | 340 | ||
341 | case DECODER_DUMP: | 341 | case DECODER_DUMP: |
@@ -411,7 +411,7 @@ vpx3220_command (struct i2c_client *client, | |||
411 | 411 | ||
412 | /* Here we back up the input selection because it gets | 412 | /* Here we back up the input selection because it gets |
413 | overwritten when we fill the registers with the | 413 | overwritten when we fill the registers with the |
414 | choosen video norm */ | 414 | choosen video norm */ |
415 | temp_input = vpx3220_fp_read(client, 0xf2); | 415 | temp_input = vpx3220_fp_read(client, 0xf2); |
416 | 416 | ||
417 | dprintk(1, KERN_DEBUG "%s: DECODER_SET_NORM %d\n", | 417 | dprintk(1, KERN_DEBUG "%s: DECODER_SET_NORM %d\n", |
@@ -578,7 +578,7 @@ static unsigned short normal_i2c[] = | |||
578 | }; | 578 | }; |
579 | 579 | ||
580 | static unsigned short ignore = I2C_CLIENT_END; | 580 | static unsigned short ignore = I2C_CLIENT_END; |
581 | 581 | ||
582 | static struct i2c_client_address_data addr_data = { | 582 | static struct i2c_client_address_data addr_data = { |
583 | .normal_i2c = normal_i2c, | 583 | .normal_i2c = normal_i2c, |
584 | .probe = &ignore, | 584 | .probe = &ignore, |
@@ -661,7 +661,7 @@ vpx3220_detect_client (struct i2c_adapter *adapter, | |||
661 | break; | 661 | break; |
662 | default: | 662 | default: |
663 | dprintk(1, | 663 | dprintk(1, |
664 | KERN_INFO | 664 | KERN_INFO |
665 | "%s: Wrong part number (0x%04x)\n", | 665 | "%s: Wrong part number (0x%04x)\n", |
666 | __func__, pn); | 666 | __func__, pn); |
667 | kfree(client); | 667 | kfree(client); |