diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-17 20:51:16 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-17 20:51:16 +0100 |
| commit | 8b0affecb98f91142015ccf8c43653e1ad87c156 (patch) | |
| tree | c8845c9e4ceef07fb7946326f137ad615f8acf9b /drivers/usb/ulpi/ulpi-viewport.c | |
| parent | 509adc8b77f885e946449ed62191fbef7fe67b56 (diff) | |
| parent | b2fb47f1873ae812ce33129996a22b11a36d0aa9 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
* 'master' of git://git.denx.de/u-boot-usb:
USB: Use (get|put)_unaligned for accessing wMaxPacketSize
usb:gadget:s5p Enable the USB Gadget framework at Exynos4210 (C210 Universal)
README: add documentation for CONFIG_USB_ULPI*
USB: ULPI: increase error case verbosity
USB: ULPI: clean a mixup of return types
USB: ULPI: switch argument type from u8 to unsigned
Diffstat (limited to 'drivers/usb/ulpi/ulpi-viewport.c')
| -rw-r--r-- | drivers/usb/ulpi/ulpi-viewport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c index fa2e004a6c..490fb0e25d 100644 --- a/drivers/usb/ulpi/ulpi-viewport.c +++ b/drivers/usb/ulpi/ulpi-viewport.c @@ -98,7 +98,7 @@ static int ulpi_request(u32 ulpi_viewport, u32 value) return err; } -u32 ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value) +int ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value) { u32 val = ULPI_RWRUN | ULPI_RWCTRL | ((u32)reg << 16) | (value & 0xff); @@ -107,7 +107,7 @@ u32 ulpi_write(u32 ulpi_viewport, u8 *reg, u32 value) u32 ulpi_read(u32 ulpi_viewport, u8 *reg) { - u32 err; + int err; u32 val = ULPI_RWRUN | ((u32)reg << 16); err = ulpi_request(ulpi_viewport, val); |