diff --git a/[refs] b/[refs]
index 70b259cd738c..44cd53c4badf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c12bf8de7e1557afeedd55d9bcec6b6a6d7b5d1
+refs/heads/master: e5d85b9ac3133f67460ea5b2d4e33e0473d6eb4b
diff --git a/trunk/drivers/media/rc/gpio-ir-recv.c b/trunk/drivers/media/rc/gpio-ir-recv.c
index ba1a1eb356cf..32db5f59fbc3 100644
--- a/trunk/drivers/media/rc/gpio-ir-recv.c
+++ b/trunk/drivers/media/rc/gpio-ir-recv.c
@@ -129,12 +129,12 @@ static int __devinit gpio_ir_recv_probe(struct platform_device *pdev)
 err_request_irq:
 	platform_set_drvdata(pdev, NULL);
 	rc_unregister_device(rcdev);
+	rcdev = NULL;
 err_register_rc_device:
 err_gpio_direction_input:
 	gpio_free(pdata->gpio_nr);
 err_gpio_request:
 	rc_free_device(rcdev);
-	rcdev = NULL;
 err_allocate_device:
 	kfree(gpio_dev);
 	return rc;