1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index c82c402285a0..dbaca9f1efad 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
@@ -200,10 +200,8 @@ static ssize_t lcd_write(struct file *file, const char __user * user_buffer, siz
 
         /* create a urb, and a buffer for it, and copy the data to the urb */
         urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!urb) {
-                retval = -ENOMEM;
-                goto error;
-        }
+        if (!urb)
+                return -ENOMEM;
         
         buf = usb_buffer_alloc(dev->udev, count, GFP_KERNEL, &urb->transfer_dma);
         if (!buf) {
@@ -241,7 +239,7 @@ error:
         return retval;
 }
 
-static struct file_operations lcd_fops = {
+static const struct file_operations lcd_fops = {
         .owner =        THIS_MODULE,
         .read =         lcd_read,
         .write =        lcd_write,
@@ -292,9 +290,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id
                 endpoint = &iface_desc->endpoint[i].desc;
 
                 if (!dev->bulk_in_endpointAddr &&
-                    (endpoint->bEndpointAddress & USB_DIR_IN) &&
-                    ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
-                                        == USB_ENDPOINT_XFER_BULK)) {
+                    usb_endpoint_is_bulk_in(endpoint)) {
                         /* we found a bulk in endpoint */
                         buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
                         dev->bulk_in_size = buffer_size;
@@ -307,9 +303,7 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id
                 }
 
                 if (!dev->bulk_out_endpointAddr &&
-                    !(endpoint->bEndpointAddress & USB_DIR_IN) &&
-                    ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
-                                        == USB_ENDPOINT_XFER_BULK)) {
+                    usb_endpoint_is_bulk_out(endpoint)) {
                         /* we found a bulk out endpoint */
                         dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
                 }