summaryrefslogtreecommitdiff
path: root/drivers/media/video/tvp5150.c
diff options
context:
space:
mode:
authorJody McIntyre <scjody@modernduck.com>2005-12-13 07:34:32 +0300
committerJody McIntyre <scjody@modernduck.com>2005-12-13 07:34:32 +0300
commit525352eb6d355bef6adf597252fc6d04f2dbe66c (patch)
tree4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/media/video/tvp5150.c
parentd51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff)
parent0e670506668a43e1355b8f10c33d081a676bd521 (diff)
downloadlinux-525352eb6d355bef6adf597252fc6d04f2dbe66c.tar.xz
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/video/tvp5150.c')
-rw-r--r--drivers/media/video/tvp5150.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 81e6d4494e7d..97431e26d229 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -31,7 +31,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
#define dprintk(num, format, args...) \
do { \
if (debug >= num) \
- printk(format , ##args); \
+ printk(format, ##args); \
} while (0)
/* supported controls */
@@ -770,7 +770,6 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
if (debug > 1)
dump_reg(client);
-
return 0;
}