← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/usb/gadget/mv_udc_core.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/gadget/mv_udc_core.c
325
325
 
326
326
                        /*
327
327
                         * Ensure that updates to the QH will
328
 
                         * occure before priming.
 
328
                         * occur before priming.
329
329
                         */
330
330
                        wmb();
331
331
 
338
338
                        & EP_QUEUE_HEAD_NEXT_POINTER_MASK;;
339
339
                dqh->size_ioc_int_sts = 0;
340
340
 
341
 
                /* Ensure that updates to the QH will occure before priming. */
 
341
                /* Ensure that updates to the QH will occur before priming. */
342
342
                wmb();
343
343
 
344
344
                /* Prime the Endpoint */
1845
1845
                return IRQ_NONE;
1846
1846
        }
1847
1847
 
1848
 
        /* Clear all the interrupts occured */
 
1848
        /* Clear all the interrupts occurred */
1849
1849
        writel(status, &udc->op_regs->usbsts);
1850
1850
 
1851
1851
        if (status & USBSTS_ERR)
2083
2083
}
2084
2084
 
2085
2085
#ifdef CONFIG_PM
2086
 
static int mv_udc_suspend(struct platform_device *_dev, pm_message_t state)
 
2086
static int mv_udc_suspend(struct device *_dev)
2087
2087
{
2088
2088
        struct mv_udc *udc = the_controller;
2089
2089
 
2092
2092
        return 0;
2093
2093
}
2094
2094
 
2095
 
static int mv_udc_resume(struct platform_device *_dev)
 
2095
static int mv_udc_resume(struct device *_dev)
2096
2096
{
2097
2097
        struct mv_udc *udc = the_controller;
2098
2098
        int retval;
2100
2100
        retval = mv_udc_phy_init(udc->phy_regs);
2101
2101
        if (retval) {
2102
2102
                dev_err(_dev, "phy initialization error %d\n", retval);
2103
 
                goto error;
 
2103
                return retval;
2104
2104
        }
2105
2105
        udc_reset(udc);
2106
2106
        ep0_reset(udc);
2122
2122
                .owner  = THIS_MODULE,
2123
2123
                .name   = "pxa-u2o",
2124
2124
#ifdef CONFIG_PM
2125
 
                .pm     = mv_udc_pm_ops,
 
2125
                .pm     = &mv_udc_pm_ops,
2126
2126
#endif
2127
2127
        },
2128
2128
};