diff --git a/[refs] b/[refs]
index c5735fb06814..213076365e3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c4a07b2da61bcd33f18195ff7f355c5bb285904
+refs/heads/master: d6f34d7adddb144c3b450e15df3749f0e0a651c6
diff --git a/trunk/drivers/media/video/ir-kbd-i2c.c b/trunk/drivers/media/video/ir-kbd-i2c.c
index 58a1ddddb09e..7942bd078513 100644
--- a/trunk/drivers/media/video/ir-kbd-i2c.c
+++ b/trunk/drivers/media/video/ir-kbd-i2c.c
@@ -508,7 +508,7 @@ static int ir_probe(struct i2c_adapter *adap)
 	static const int probe_em28XX[] = { 0x30, 0x47, -1 };
 	static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
 	static const int probe_cx23885[] = { 0x6b, -1 };
-	const int *probe = NULL;
+	const int *probe;
 	struct i2c_client *c;
 	unsigned char buf;
 	int i, rc;
@@ -532,9 +532,9 @@ static int ir_probe(struct i2c_adapter *adap)
 	case I2C_HW_B_CX23885:
 		probe = probe_cx23885;
 		break;
-	}
-	if (NULL == probe)
+	default:
 		return 0;
+	}
 
 	c = kzalloc(sizeof(*c), GFP_KERNEL);
 	if (!c)