]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
usblp: Make use of URB_FREE_BUFFER
authorPete Zaitcev <zaitcev@redhat.com>
Mon, 23 Jul 2007 09:17:49 +0000 (02:17 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 12 Oct 2007 21:54:58 +0000 (14:54 -0700)
Employ the new API URB_FREE_BUFFER that we've got. There was talk of a combined
constructor for this case, but apparently it's not happening, so just set the
flag explicitly for now.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/class/usblp.c

index 30d5a1315cc854691d53d22a31c74f0258aae1e2..9696668e5752a5ce3745ea560664e2e4d97912bd 100644 (file)
@@ -331,9 +331,6 @@ static void usblp_bulk_write(struct urb *urb)
        wake_up(&usblp->wwait);
        spin_unlock(&usblp->lock);
 
-       /* XXX Use usb_setup_bulk_urb when available. Talk to Marcel. */
-       kfree(urb->transfer_buffer);
-       urb->transfer_buffer = NULL;    /* Not refcounted, so to be safe... */
        usb_free_urb(urb);
 }
 
@@ -719,6 +716,7 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                        usb_sndbulkpipe(usblp->dev,
                          usblp->protocol[usblp->current_protocol].epwrite->bEndpointAddress),
                        writebuf, transfer_length, usblp_bulk_write, usblp);
+               writeurb->transfer_flags |= URB_FREE_BUFFER;
                usb_anchor_urb(writeurb, &usblp->urbs);
 
                if (copy_from_user(writebuf,