git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 3.0-rc2 + Linus's latest into usb-linus
[pandora-kernel.git]
/
drivers
/
usb
/
gadget
/
mv_udc_core.c
diff --git
a/drivers/usb/gadget/mv_udc_core.c
b/drivers/usb/gadget/mv_udc_core.c
index
d5468a7
..
b1a8146
100644
(file)
--- a/
drivers/usb/gadget/mv_udc_core.c
+++ b/
drivers/usb/gadget/mv_udc_core.c
@@
-325,7
+325,7
@@
static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
/*
* Ensure that updates to the QH will
/*
* Ensure that updates to the QH will
- * occur
e
before priming.
+ * occur before priming.
*/
wmb();
*/
wmb();
@@
-338,7
+338,7
@@
static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
& EP_QUEUE_HEAD_NEXT_POINTER_MASK;;
dqh->size_ioc_int_sts = 0;
& EP_QUEUE_HEAD_NEXT_POINTER_MASK;;
dqh->size_ioc_int_sts = 0;
- /* Ensure that updates to the QH will occur
e
before priming. */
+ /* Ensure that updates to the QH will occur before priming. */
wmb();
/* Prime the Endpoint */
wmb();
/* Prime the Endpoint */
@@
-1845,7
+1845,7
@@
static irqreturn_t mv_udc_irq(int irq, void *dev)
return IRQ_NONE;
}
return IRQ_NONE;
}
- /* Clear all the interrupts occured */
+ /* Clear all the interrupts occur
r
ed */
writel(status, &udc->op_regs->usbsts);
if (status & USBSTS_ERR)
writel(status, &udc->op_regs->usbsts);
if (status & USBSTS_ERR)
@@
-2083,7
+2083,7
@@
out:
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM
-static int mv_udc_suspend(struct
platform_device *_dev, pm_message_t state
)
+static int mv_udc_suspend(struct
device *_dev
)
{
struct mv_udc *udc = the_controller;
{
struct mv_udc *udc = the_controller;
@@
-2092,7
+2092,7
@@
static int mv_udc_suspend(struct platform_device *_dev, pm_message_t state)
return 0;
}
return 0;
}
-static int mv_udc_resume(struct
platform_
device *_dev)
+static int mv_udc_resume(struct device *_dev)
{
struct mv_udc *udc = the_controller;
int retval;
{
struct mv_udc *udc = the_controller;
int retval;
@@
-2100,7
+2100,7
@@
static int mv_udc_resume(struct platform_device *_dev)
retval = mv_udc_phy_init(udc->phy_regs);
if (retval) {
dev_err(_dev, "phy initialization error %d\n", retval);
retval = mv_udc_phy_init(udc->phy_regs);
if (retval) {
dev_err(_dev, "phy initialization error %d\n", retval);
-
goto error
;
+
return retval
;
}
udc_reset(udc);
ep0_reset(udc);
}
udc_reset(udc);
ep0_reset(udc);
@@
-2122,7
+2122,7
@@
static struct platform_driver udc_driver = {
.owner = THIS_MODULE,
.name = "pxa-u2o",
#ifdef CONFIG_PM
.owner = THIS_MODULE,
.name = "pxa-u2o",
#ifdef CONFIG_PM
- .pm = mv_udc_pm_ops,
+ .pm =
&
mv_udc_pm_ops,
#endif
},
};
#endif
},
};