Merge remote-tracking branch 'battery/for-next'

[deliverable/linux.git] / drivers / media / rc / redrat3.c

diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index 399f44d89a298606ebd751ae672fb7f4437190d9..8d7df6dfcb20c2437b6f0e498e6dbc602e4b1a2e 100644 (file)
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -480,7 +480,7 @@ static int redrat3_set_timeout(struct rc_dev *rc_dev, unsigned int timeoutns)
        struct redrat3_dev *rr3 = rc_dev->priv;
        struct usb_device *udev = rr3->udev;
        struct device *dev = rr3->dev;
-       u32 *timeout;
+       __be32 *timeout;
        int ret;
 
        timeout = kmalloc(sizeof(*timeout), GFP_KERNEL);
@@ -970,10 +970,8 @@ static int redrat3_dev_probe(struct usb_interface *intf,
 
        /* set up bulk-in endpoint */
        rr3->read_urb = usb_alloc_urb(0, GFP_KERNEL);
-       if (!rr3->read_urb) {
-               dev_err(dev, "Read urb allocation failure\n");
+       if (!rr3->read_urb)
                goto error;
-       }
 
        rr3->ep_in = ep_in;
        rr3->bulk_in_buf = usb_alloc_coherent(udev,