diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-30 22:46:49 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-30 22:46:49 -0600 |
| commit | 4a70d7bbda936a5e93a2d6f6061800327491cc69 (patch) | |
| tree | e7734e7cfedf5a03d71471826f116e45df37272d /linux/drivers/media/video/tea6420.c | |
| parent | 012c447c3dd586921468215450cb6cce65052a3c (diff) | |
| parent | b03dad0db6b312169fd2e16c18187703b23ecd38 (diff) | |
| download | mediapointer-dvb-s2-4a70d7bbda936a5e93a2d6f6061800327491cc69.tar.gz mediapointer-dvb-s2-4a70d7bbda936a5e93a2d6f6061800327491cc69.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/tea6420.c')
| -rw-r--r-- | linux/drivers/media/video/tea6420.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tea6420.c b/linux/drivers/media/video/tea6420.c index 74af061b2..9896661da 100644 --- a/linux/drivers/media/video/tea6420.c +++ b/linux/drivers/media/video/tea6420.c @@ -38,6 +38,7 @@ static int debug = 0; /* insmod parameter */ module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) +#define dprintk(args...) \ do { if (debug) { printk("%s: %s()[%d]: ",__stringify(KBUILD_MODNAME), __FUNCTION__, __LINE__); printk(args); } } while (0) #else #define dprintk(args...) \ @@ -108,11 +109,10 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind) } /* allocate memory for client structure */ - client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); + client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); if (0 == client) { return -ENOMEM; } - memset(client, 0x0, sizeof(struct i2c_client)); /* fill client structure */ memcpy(client, &client_template, sizeof(struct i2c_client)); |