---

yaml
---
r: 21687
b: refs/heads/master
c: 6457af5
h: refs/heads/master
i:
  21685: a532752
  21683: df210cf
  21679: e91bf91
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dadaff2db46aae917ccdbceb2cd2ecac75767435
+refs/heads/master: 6457af5f7eac49ff8e072fdc98c986d4ac874b04

trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c

@@ -243,7 +243,7 @@ static int pinnsat_pll_init(struct dvb_frontend* fe)
 
 	bttv_gpio_enable(card->bttv_nr, 1, 1);  /* output */
 	bttv_write_gpio(card->bttv_nr, 1, 1);   /* relay on */
-	
+
 	return 0;
 }
 

trunk/drivers/media/video/cx88/cx88-video.c

@@ -918,9 +918,9 @@ static int get_control(struct cx88_core *core, struct v4l2_control *ctl)
 		ctl->value = ((value + (c->off << c->shift)) & c->mask) >> c->shift;
 		break;
 	}
-	printk("get_control id=0x%X reg=0x%02x val=0x%02x (mask 0x%02x)%s\n",
-					ctl->id, c->reg, ctl->value,
-					c->mask, c->sreg ? " [shadowed]" : "");
+	dprintk(1,"get_control id=0x%X(%s) ctrl=0x%02x, reg=0x%02x val=0x%02x (mask 0x%02x)%s\n",
+				ctl->id, c->v.name, ctl->value, c->reg,
+				value,c->mask, c->sreg ? " [shadowed]" : "");
 	return 0;
 }
 
@@ -969,9 +969,9 @@ static int set_control(struct cx88_core *core, struct v4l2_control *ctl)
 		value = ((ctl->value - c->off) << c->shift) & c->mask;
 		break;
 	}
-	printk("set_control id=0x%X reg=0x%02x val=0x%02x (mask 0x%02x)%s\n",
-					ctl->id, c->reg, value,
-					mask, c->sreg ? " [shadowed]" : "");
+	dprintk(1,"set_control id=0x%X(%s) ctrl=0x%02x, reg=0x%02x val=0x%02x (mask 0x%02x)%s\n",
+				ctl->id, c->v.name, ctl->value, c->reg, value,
+				mask, c->sreg ? " [shadowed]" : "");
 	if (c->sreg) {
 		cx_sandor(c->sreg, c->reg, mask, value);
 	} else {
@@ -1252,7 +1252,7 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 {
 	int err;
 
-	dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );
+	dprintk(2, "CORE IOCTL: 0x%x\n", cmd );
 	if (video_debug > 1)
 		v4l_print_ioctl(core->name,cmd);