diff --git a/[refs] b/[refs]
index cb1ec35c64b5..2dd768ce0a73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ea7cf7680d872d199ae3d87c5897def3b8da1f7
+refs/heads/master: a84b17e20f51dbc4f5c0aedb00d66f4f7d2ede8d
diff --git a/trunk/drivers/media/rc/ati_remote.c b/trunk/drivers/media/rc/ati_remote.c
index 08aede5ffaeb..49bb356ed14c 100644
--- a/trunk/drivers/media/rc/ati_remote.c
+++ b/trunk/drivers/media/rc/ati_remote.c
@@ -937,8 +937,10 @@ static int ati_remote_probe(struct usb_interface *interface,
 	/* Set up and register mouse input device */
 	if (mouse) {
 		input_dev = input_allocate_device();
-		if (!input_dev)
+		if (!input_dev) {
+			err = -ENOMEM;
 			goto fail4;
+		}
 
 		ati_remote->idev = input_dev;
 		ati_remote_input_init(ati_remote);