diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-14 08:25:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-14 08:25:19 -0700 |
| commit | 3011c7f0d421ed85c75683addf3b31eaa1ab6cec (patch) | |
| tree | bf35128e4b3958b39fa4e158a7ead2b7831777a8 /drivers/media/common/tuners/qt1010.c | |
| parent | 64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff) | |
| parent | 08b39642b1e375afd014c50f6013ec4a292ca3b2 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (38 commits)
V4L/DVB (12441): siano: read buffer overflow
V4L/DVB (12440): Use kzalloc for frontend states to have struct dvb_frontend properly
V4L/DVB (12438): Read buffer overflow
V4L/DVB (12437): dvb: siano uses/depends on INPUT
V4L/DVB (12436): stk-webcam: read buffer overflow
V4L/DVB (12432): em28xx: fix regression in Empire DualTV digital tuning
V4L/DVB (12429): v4l2-ioctl: fix G_STD and G_PARM default handlers
V4L/DVB (12428): hdpvr: add missing initialization of current_norm
V4L/DVB (12424): soc-camera: fix recursive locking in .buf_queue()
V4L/DVB (12422): media/zr364xx: fix build errors
V4L/DVB (12405): em28xx-cards: move register 0x13 setting to the proper place
V4L/DVB (12411): em28xx: Fix artifacts with Silvercrest webcam
V4L/DVB (12410): em28xx: Move the non-board dependent part to be outside em28xx_pre_card_setup()
V4L/DVB (12407): em28xx: Adjust Silvercrest xtal frequency
V4L/DVB (12406): em28xx: fix: don't do image interlacing on webcams
V4L/DVB (12403): em28xx: properly reports some em2710 chips
V4L/DVB (12402): em28xx: fix: some em2710 chips use a different vendor ID
V4L/DVB (12401): m9v011: add vflip/hflip controls to control mirror/upside down
V4L/DVB (12400): em28xx: Allow changing fps on webcams
V4L/DVB (12399): mt9v011: Add support for controlling frame rates
...
Diffstat (limited to 'drivers/media/common/tuners/qt1010.c')
| -rw-r--r-- | drivers/media/common/tuners/qt1010.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/common/tuners/qt1010.c b/drivers/media/common/tuners/qt1010.c index 825aa1412e6f..9f5dba244cb8 100644 --- a/drivers/media/common/tuners/qt1010.c +++ b/drivers/media/common/tuners/qt1010.c @@ -64,24 +64,22 @@ static int qt1010_writereg(struct qt1010_priv *priv, u8 reg, u8 val) /* dump all registers */ static void qt1010_dump_regs(struct qt1010_priv *priv) { - char buf[52], buf2[4]; u8 reg, val; for (reg = 0; ; reg++) { if (reg % 16 == 0) { if (reg) - printk("%s\n", buf); - sprintf(buf, "%02x: ", reg); + printk(KERN_CONT "\n"); + printk(KERN_DEBUG "%02x:", reg); } if (qt1010_readreg(priv, reg, &val) == 0) - sprintf(buf2, "%02x ", val); + printk(KERN_CONT " %02x", val); else - strcpy(buf2, "-- "); - strcat(buf, buf2); + printk(KERN_CONT " --"); if (reg == 0x2f) break; } - printk("%s\n", buf); + printk(KERN_CONT "\n"); } static int qt1010_set_params(struct dvb_frontend *fe, |