Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[sfrench/cifs-2.6.git] / drivers / usb / gadget / udc / at91_udc.c

diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
index 6d285226ab949e4034d7f694668e0d24247805f6..2fbedca3c2b4eb80a19325c3bcc54913df6a7c27 100644 (file)
--- a/drivers/usb/gadget/udc/at91_udc.c
+++ b/drivers/usb/gadget/udc/at91_udc.c
@@ -177,7 +177,7 @@ static int proc_udc_show(struct seq_file *s, void *unused)
                udc->enabled
                        ? (udc->vbus ? "active" : "enabled")
                        : "disabled",
-               udc->selfpowered ? "self" : "VBUS",
+               udc->gadget.is_selfpowered ? "self" : "VBUS",
                udc->suspended ? ", suspended" : "",
                udc->driver ? udc->driver->driver.name : "(none)");
 
@@ -970,7 +970,7 @@ static int at91_set_selfpowered(struct usb_gadget *gadget, int is_on)
        unsigned long   flags;
 
        spin_lock_irqsave(&udc->lock, flags);
-       udc->selfpowered = (is_on != 0);
+       gadget->is_selfpowered = (is_on != 0);
        spin_unlock_irqrestore(&udc->lock, flags);
        return 0;
 }
@@ -1119,7 +1119,7 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
         */
        case ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
                        | USB_REQ_GET_STATUS:
-               tmp = (udc->selfpowered << USB_DEVICE_SELF_POWERED);
+               tmp = (udc->gadget.is_selfpowered << USB_DEVICE_SELF_POWERED);
                if (at91_udp_read(udc, AT91_UDP_GLB_STAT) & AT91_UDP_ESR)
                        tmp |= (1 << USB_DEVICE_REMOTE_WAKEUP);
                PACKET("get device status\n");
@@ -1555,7 +1555,7 @@ static int at91_start(struct usb_gadget *gadget,
        udc->driver = driver;
        udc->gadget.dev.of_node = udc->pdev->dev.of_node;
        udc->enabled = 1;
-       udc->selfpowered = 1;
+       udc->gadget.is_selfpowered = 1;
 
        return 0;
 }