diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-23 18:40:57 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-23 18:40:57 +0000 |
| commit | b080c7946b957501e4cc80c54978dfa401a027d0 (patch) | |
| tree | 332d7bbf79e57bd0043c6242b1246598c7804e5f /stm/lib/usb_dcd_int.c | |
| parent | 1e708fed188e3471cc7bed13635ba69b48bc8cf7 (diff) | |
| parent | 1d1e4e1bd5e95d609460e022ea395cd676b5e009 (diff) | |
| download | micropython-b080c7946b957501e4cc80c54978dfa401a027d0.tar.gz micropython-b080c7946b957501e4cc80c54978dfa401a027d0.zip | |
Merge branch 'master' of github.com:iabdalkader/micropython into iabdalkader-master
Conflicts:
stm/main.c
Diffstat (limited to 'stm/lib/usb_dcd_int.c')
| -rw-r--r-- | stm/lib/usb_dcd_int.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stm/lib/usb_dcd_int.c b/stm/lib/usb_dcd_int.c index 7089f34978..4dd9ce8396 100644 --- a/stm/lib/usb_dcd_int.c +++ b/stm/lib/usb_dcd_int.c @@ -352,7 +352,7 @@ static uint32_t DCD_HandleResume_ISR(USB_OTG_CORE_HANDLE *pdev) if(pdev->cfg.low_power)
{
/* un-gate USB Core clock */
- power.d32 = USB_OTG_READ_REG32(&pdev->regs.PCGCCTL); // dpgeorge: taking the address here might be wrong...
+ power.d32 = USB_OTG_READ_REG32(pdev->regs.PCGCCTL);
power.b.gatehclk = 0;
power.b.stoppclk = 0;
USB_OTG_WRITE_REG32(pdev->regs.PCGCCTL, power.d32);
|