diff --git a/[refs] b/[refs]
index 0f1e60b3afaa..2b6305d68e2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7c7a4bed8d695933ae172031556de9de30ae598
+refs/heads/master: dea8a39fb569c23084c857ccdbf70a95ea3bf7dc
diff --git a/trunk/drivers/media/rc/rc-main.c b/trunk/drivers/media/rc/rc-main.c
index 6bdd0d3c02e8..72be8a02118c 100644
--- a/trunk/drivers/media/rc/rc-main.c
+++ b/trunk/drivers/media/rc/rc-main.c
@@ -325,7 +325,7 @@ static int ir_setkeycode(struct input_dev *idev,
 	struct rc_map *rc_map = &rdev->rc_map;
 	unsigned int index;
 	unsigned int scancode;
-	int retval;
+	int retval = 0;
 	unsigned long flags;
 
 	spin_lock_irqsave(&rc_map->lock, flags);