From 74cfa91a2d1a2b4b49d4ea476436ead79e3608f2 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 6 Jan 2012 14:26:14 -0300 Subject: [PATCH] --- yaml --- r: 285759 b: refs/heads/master c: 3796554671e6314e1ab368f5f09e302ba1bda538 h: refs/heads/master i: 285757: 84987dec3c9f4462f58ee36e1b756e4790d7b721 285755: 65fab83f07a24fd8123bbd8b8a36ea6a1a555b37 285751: 0e511b26694ce13ebc6c4de5de2dff8ff26cda92 285743: 3da8a610cb7ae94ad7f617aa90cc6b9d0cb77ef5 285727: e946561cacac2791f519a59454dff9960ab4d960 285695: 6001b761057945ffc3242ced19de3ca9da3d8a2f v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 281578ffcf1f..122e2bb2bb37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efd279ec3e6129195580d40f88ea6c3f5af701b3 +refs/heads/master: 3796554671e6314e1ab368f5f09e302ba1bda538 diff --git a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c index d8a36dd84b6e..6a6f7b95a0c0 100644 --- a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -205,7 +205,7 @@ static int cx24108_tuner_set_params(struct dvb_frontend *fe) 0x00120000,0x00140000}; #define XTAL 1011100 /* Hz, really 1.0111 MHz and a /10 prescaler */ - printk("cx24108 debug: entering SetTunerFreq, freq=%d\n",freq); + dprintk("cx24108 debug: entering SetTunerFreq, freq=%d\n", freq); /* This is really the bit driving the tuner chip cx24108 */ @@ -216,7 +216,7 @@ static int cx24108_tuner_set_params(struct dvb_frontend *fe) /* decide which VCO to use for the input frequency */ for(i = 1; (i < ARRAY_SIZE(osci) - 1) && (osci[i] < freq); i++); - printk("cx24108 debug: select vco #%d (f=%d)\n",i,freq); + dprintk("cx24108 debug: select vco #%d (f=%d)\n", i, freq); band=bandsel[i]; /* the gain values must be set by SetSymbolrate */ /* compute the pll divider needed, from Conexant data sheet, @@ -232,7 +232,7 @@ static int cx24108_tuner_set_params(struct dvb_frontend *fe) ((a&0x1f)<<11); /* everything is shifted left 11 bits to left-align the bits in the 32bit word. Output to the tuner goes MSB-aligned, after all */ - printk("cx24108 debug: pump=%d, n=%d, a=%d\n",pump,n,a); + dprintk("cx24108 debug: pump=%d, n=%d, a=%d\n", pump, n, a); cx24110_pll_write(fe,band); /* set vga and vca to their widest-band settings, as a precaution. SetSymbolrate might not be called to set this up */