aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx25840/cx25840-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx25840/cx25840-core.c')
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index c1734762436d..847b166d8b15 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -265,7 +265,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
265 vid_input <= CX25840_COMPOSITE8); 265 vid_input <= CX25840_COMPOSITE8);
266 u8 reg; 266 u8 reg;
267 267
268 v4l_dbg(1, client, "decoder set video input %d, audio input %d\n", 268 v4l_dbg(1, debug, client, "decoder set video input %d, audio input %d\n",
269 vid_input, aud_input); 269 vid_input, aud_input);
270 270
271 if (is_composite) { 271 if (is_composite) {
@@ -533,7 +533,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt)
533 else 533 else
534 filter = 3; 534 filter = 3;
535 535
536 v4l_dbg(1, client, "decoder set size %dx%d -> scale %ux%u\n", 536 v4l_dbg(1, debug, client, "decoder set size %dx%d -> scale %ux%u\n",
537 pix->width, pix->height, HSC, VSC); 537 pix->width, pix->height, HSC, VSC);
538 538
539 /* HSCALE=HSC */ 539 /* HSCALE=HSC */
@@ -687,13 +687,13 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
687 return cx25840_audio(client, cmd, arg); 687 return cx25840_audio(client, cmd, arg);
688 688
689 case VIDIOC_STREAMON: 689 case VIDIOC_STREAMON:
690 v4l_dbg(1, client, "enable output\n"); 690 v4l_dbg(1, debug, client, "enable output\n");
691 cx25840_write(client, 0x115, 0x8c); 691 cx25840_write(client, 0x115, 0x8c);
692 cx25840_write(client, 0x116, 0x07); 692 cx25840_write(client, 0x116, 0x07);
693 break; 693 break;
694 694
695 case VIDIOC_STREAMOFF: 695 case VIDIOC_STREAMOFF:
696 v4l_dbg(1, client, "disable output\n"); 696 v4l_dbg(1, debug, client, "disable output\n");
697 cx25840_write(client, 0x115, 0x00); 697 cx25840_write(client, 0x115, 0x00);
698 cx25840_write(client, 0x116, 0x00); 698 cx25840_write(client, 0x116, 0x00);
699 break; 699 break;
@@ -871,7 +871,7 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
871 client->driver = &i2c_driver_cx25840; 871 client->driver = &i2c_driver_cx25840;
872 snprintf(client->name, sizeof(client->name) - 1, "cx25840"); 872 snprintf(client->name, sizeof(client->name) - 1, "cx25840");
873 873
874 v4l_dbg(1, client, "detecting cx25840 client on address 0x%x\n", address << 1); 874 v4l_dbg(1, debug, client, "detecting cx25840 client on address 0x%x\n", address << 1);
875 875
876 device_id = cx25840_read(client, 0x101) << 8; 876 device_id = cx25840_read(client, 0x101) << 8;
877 device_id |= cx25840_read(client, 0x100); 877 device_id |= cx25840_read(client, 0x100);
@@ -879,7 +879,7 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
879 /* The high byte of the device ID should be 879 /* The high byte of the device ID should be
880 * 0x84 if chip is present */ 880 * 0x84 if chip is present */
881 if ((device_id & 0xff00) != 0x8400) { 881 if ((device_id & 0xff00) != 0x8400) {
882 v4l_dbg(1, client, "cx25840 not found\n"); 882 v4l_dbg(1, debug, client, "cx25840 not found\n");
883 kfree(client); 883 kfree(client);
884 return 0; 884 return 0;
885 } 885 }