aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/media/cxd2099/cxd2099.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/cxd2099/cxd2099.c b/drivers/staging/media/cxd2099/cxd2099.c
index 1c04185bcfd7..16785032ac8c 100644
--- a/drivers/staging/media/cxd2099/cxd2099.c
+++ b/drivers/staging/media/cxd2099/cxd2099.c
@@ -683,17 +683,17 @@ struct dvb_ca_en50221 *cxd2099_attach(struct cxd2099_cfg *cfg,
683 void *priv, 683 void *priv,
684 struct i2c_adapter *i2c) 684 struct i2c_adapter *i2c)
685{ 685{
686 struct cxd *ci = 0; 686 struct cxd *ci;
687 u8 val; 687 u8 val;
688 688
689 if (i2c_read_reg(i2c, cfg->adr, 0, &val) < 0) { 689 if (i2c_read_reg(i2c, cfg->adr, 0, &val) < 0) {
690 printk(KERN_INFO "No CXD2099 detected at %02x\n", cfg->adr); 690 printk(KERN_INFO "No CXD2099 detected at %02x\n", cfg->adr);
691 return 0; 691 return NULL;
692 } 692 }
693 693
694 ci = kmalloc(sizeof(struct cxd), GFP_KERNEL); 694 ci = kmalloc(sizeof(struct cxd), GFP_KERNEL);
695 if (!ci) 695 if (!ci)
696 return 0; 696 return NULL;
697 memset(ci, 0, sizeof(*ci)); 697 memset(ci, 0, sizeof(*ci));
698 698
699 mutex_init(&ci->lock); 699 mutex_init(&ci->lock);