]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
usb: u132-hcd.c: fix shadows sparse warning
authorBill Pemberton <wfp5p@viridian.itc.virginia.edu>
Thu, 29 Apr 2010 14:04:56 +0000 (10:04 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 20 May 2010 20:21:41 +0000 (13:21 -0700)
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/u132-hcd.c

index fbd7adafd61cf85adefba00ccb1832327b8ee039..11a97d93dff2853ee5e18a044f6cb5745869620a 100644 (file)
@@ -1446,7 +1446,7 @@ static void u132_hcd_endp_work_scheduler(struct work_struct *work)
                        return;
                } else {
                        int retval;
-                       u8 address = u132->addr[endp->usb_addr].address;
+                       address = u132->addr[endp->usb_addr].address;
                        struct urb *urb = endp->urb_list[ENDP_QUEUE_MASK &
                                endp->queue_next];
                        endp->active = 1;
@@ -3120,8 +3120,8 @@ static int __devinit u132_probe(struct platform_device *pdev)
                ftdi_elan_gone_away(pdev);
                return -ENOMEM;
        } else {
-               int retval = 0;
                struct u132 *u132 = hcd_to_u132(hcd);
+               retval = 0;
                hcd->rsrc_start = 0;
                mutex_lock(&u132_module_lock);
                list_add_tail(&u132->u132_list, &u132_static_list);