Merge tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / drivers / staging / media / lirc / lirc_sasem.c

diff --git a/drivers/staging/media/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c
index c32e2965da875ad9fa3e4b88dd8054892359d12e..c20ef56202bf05ab9c8c72860c01f08ef813beeb 100644 (file)
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -475,8 +475,6 @@ static void usb_tx_callback(struct urb *urb)
        /* notify waiters that write has finished */
        atomic_set(&context->tx.busy, 0);
        complete(&context->tx.finished);
-
-       return;
 }
 
 /**
@@ -563,7 +561,6 @@ static void ir_close(void *data)
        }
 
        mutex_unlock(&context->ctx_lock);
-       return;
 }
 
 /**
@@ -665,7 +662,6 @@ static void usb_rx_callback(struct urb *urb)
        }
 
        usb_submit_urb(context->rx_urb, GFP_ATOMIC);
-       return;
 }
 
 
@@ -714,6 +710,7 @@ static int sasem_probe(struct usb_interface *interface,
                struct usb_endpoint_descriptor *ep;
                int ep_dir;
                int ep_type;
+
                ep = &iface_desc->endpoint [i].desc;
                ep_dir = ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK;
                ep_type = ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;