diff --git a/[refs] b/[refs]
index 07593efc9d13..a10bc07ad401 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1497357dce240880d984f4b657b54245f739dbc
+refs/heads/master: 1e42dc78900e9d0ce89d77f3ba6aca00abd5f1b5
diff --git a/trunk/drivers/media/dvb/mantis/mantis_input.c b/trunk/drivers/media/dvb/mantis/mantis_input.c
index 9395fcf4a453..b27d7759788b 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_input.c
+++ b/trunk/drivers/media/dvb/mantis/mantis_input.c
@@ -129,6 +129,7 @@ int mantis_input_init(struct mantis_pci *mantis)
 	err = input_register_device(rc);
 	if (err) {
 		dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err);
+		input_free_device(rc);
 		return -ENODEV;
 	}