diff --git a/[refs] b/[refs]
index 6dd15dcb062a..d70f4ebafdc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c79b496a713dac1a706845bdd047aae15421ef5
+refs/heads/master: 49b7a12c0aa217c9fb163d330b5b80bafe55cb8b
diff --git a/trunk/drivers/media/IR/ir-lirc-codec.c b/trunk/drivers/media/IR/ir-lirc-codec.c
index ee1f2d443ab2..3ba482d96c4b 100644
--- a/trunk/drivers/media/IR/ir-lirc-codec.c
+++ b/trunk/drivers/media/IR/ir-lirc-codec.c
@@ -187,7 +187,7 @@ static int ir_lirc_register(struct input_dev *input_dev)
 		return rc;
 
 	rbuf = kzalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
-	if (!drv)
+	if (!rbuf)
 		goto rbuf_alloc_failed;
 
 	rc = lirc_buffer_init(rbuf, sizeof(int), LIRCBUF_SIZE);