Attachment 606689 Details for Bug 842275 – compile fixes

[patch] compile fixes

hanscompile.patch (text/plain), 2.32 KB, created by Don Zickus on 2012-08-23 19:01:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Zickus

Created: 2012-08-23 19:01:14 UTC

Size: 2.32 KB

patch

obsolete

>commit eb4e2a4224bcc7eb96802a1c78527264ed42ed70
>Author: Don Zickus <dzickus@redhat.com>
>Date:   Fri Aug 10 14:17:50 2012 -0400
>
>    usb: compiler fixes for sg changes
>    (will merge later)
>
>diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
>index 92276e3..dc2525f 100644
>--- a/drivers/usb/core/devio.c
>+++ b/drivers/usb/core/devio.c
>@@ -273,10 +273,10 @@ static void free_async(struct async *as)
> 
> 	put_pid(as->pid);
> 	for (i = 0; i < as->urb->num_sgs; i++) {
>-		if (sg_page(&as->urb->sg[i]))
>-			kfree(sg_virt(&as->urb->sg[i]));
>+		if (sg_page(&as->urb->sg->sg[i]))
>+			kfree(sg_virt(&as->urb->sg->sg[i]));
> 	}
>-	kfree(as->urb->sg);
>+	kfree(as->urb->sg->sg);
> 	kfree(as->urb->transfer_buffer);
> 	kfree(as->urb->setup_packet);
> 	usb_free_urb(as->urb);
>@@ -390,7 +390,7 @@ static void snoop_urb_data(struct urb *urb, unsigned len)
> 	for (i = 0; i < urb->num_sgs && len; i++) {
> 		size = (len > USB_SG_SIZE) ? USB_SG_SIZE : len;
> 		print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_NONE, 32, 1,
>-			sg_virt(&urb->sg[i]), size, 1);
>+			sg_virt(&urb->sg->sg[i]), size, 1);
> 		len -= size;
> 	}
> }
>@@ -412,7 +412,7 @@ static int copy_urb_data_to_user(u8 __user *userbuffer, struct urb *urb)
> 
> 	for (i = 0; i < urb->num_sgs && len; i++) {
> 		size = (len > USB_SG_SIZE) ? USB_SG_SIZE : len;
>-		if (copy_to_user(userbuffer, sg_virt(&urb->sg[i]), size))
>+		if (copy_to_user(userbuffer, sg_virt(&urb->sg->sg[i]), size))
> 			return -EFAULT;
> 		userbuffer += size;
> 		len -= size;
>@@ -1271,14 +1271,14 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
> 	as->mem_usage = u;
> 
> 	if (num_sgs) {
>-		as->urb->sg = kmalloc(num_sgs * sizeof(struct scatterlist),
>+		as->urb->sg->sg = kmalloc(num_sgs * sizeof(struct scatterlist),
> 				      GFP_KERNEL);
>-		if (!as->urb->sg) {
>+		if (!as->urb->sg->sg) {
> 			ret = -ENOMEM;
> 			goto error;
> 		}
> 		as->urb->num_sgs = num_sgs;
>-		sg_init_table(as->urb->sg, as->urb->num_sgs);
>+		sg_init_table(as->urb->sg->sg, as->urb->num_sgs);
> 
> 		totlen = uurb->buffer_length;
> 		for (i = 0; i < as->urb->num_sgs; i++) {
>@@ -1288,7 +1288,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
> 				ret = -ENOMEM;
> 				goto error;
> 			}
>-			sg_set_buf(&as->urb->sg[i], buf, u);
>+			sg_set_buf(&as->urb->sg->sg[i], buf, u);
> 
> 			if (!is_in) {
> 				if (copy_from_user(buf, uurb->buffer, u)) {

Actions: View | Diff

Attachments on bug 842275: 606684 | 606689