diff --git a/[refs] b/[refs]
index 5bfd7c61a0f8..59b9a0971e54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bc9c894641ad7e2ef937a3e087e32652be35f47
+refs/heads/master: 4aff355cd51378b6e9ca8c0a3961571ebafd1367
diff --git a/trunk/drivers/staging/media/cxd2099/cxd2099.c b/trunk/drivers/staging/media/cxd2099/cxd2099.c
index 1c04185bcfd7..16785032ac8c 100644
--- a/trunk/drivers/staging/media/cxd2099/cxd2099.c
+++ b/trunk/drivers/staging/media/cxd2099/cxd2099.c
@@ -683,17 +683,17 @@ struct dvb_ca_en50221 *cxd2099_attach(struct cxd2099_cfg *cfg,
 				      void *priv,
 				      struct i2c_adapter *i2c)
 {
-	struct cxd *ci = 0;
+	struct cxd *ci;
 	u8 val;
 
 	if (i2c_read_reg(i2c, cfg->adr, 0, &val) < 0) {
 		printk(KERN_INFO "No CXD2099 detected at %02x\n", cfg->adr);
-		return 0;
+		return NULL;
 	}
 
 	ci = kmalloc(sizeof(struct cxd), GFP_KERNEL);
 	if (!ci)
-		return 0;
+		return NULL;
 	memset(ci, 0, sizeof(*ci));
 
 	mutex_init(&ci->lock);