diff --git a/[refs] b/[refs] index 8811524cb005..cb1ec35c64b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24e527a0e7b23ca0158a4251157d234e156f88ca +refs/heads/master: 6ea7cf7680d872d199ae3d87c5897def3b8da1f7 diff --git a/trunk/drivers/media/rc/redrat3.c b/trunk/drivers/media/rc/redrat3.c index 2878b0ed9741..49731b1a9c57 100644 --- a/trunk/drivers/media/rc/redrat3.c +++ b/trunk/drivers/media/rc/redrat3.c @@ -1217,9 +1217,10 @@ static int __devinit redrat3_dev_probe(struct usb_interface *intf, rr3->carrier = 38000; rr3->rc = redrat3_init_rc_dev(rr3); - if (!rr3->rc) + if (!rr3->rc) { + retval = -ENOMEM; goto error; - + } setup_timer(&rr3->rx_timeout, redrat3_rx_timeout, (unsigned long)rr3); /* we can register the device now, as it is ready */