diff options
| author | Greg Kroah-Hartman | 2011-12-22 23:05:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-12-22 23:05:19 +0100 |
| commit | ee0db58ade2c60342a7d648f375d0a4107c39527 (patch) | |
| tree | b5e2fce1dcfa281fd15427d109d5f1226de9c8c7 /drivers/usb/renesas_usbhs/pipe.c | |
| parent | Merge branch 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | usb: dwc3: gadget: add support for SG lists (diff) | |
| download | kernel-qcow2-linux-ee0db58ade2c60342a7d648f375d0a4107c39527.tar.gz kernel-qcow2-linux-ee0db58ade2c60342a7d648f375d0a4107c39527.tar.xz kernel-qcow2-linux-ee0db58ade2c60342a7d648f375d0a4107c39527.zip | |
Merge branch 'for-gadget/next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
* 'for-gadget/next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (24 commits)
usb: dwc3: gadget: add support for SG lists
usb: dwc3: gadget: don't force 'LST' always
usb: dwc3: gadget: don't return anything on prepare trbs
usb: dwc3: gadget: re-factor dwc3_prepare_trbs()
usb: gadget: introduce support for sg lists
usb: renesas: pipe: convert a long if into a XOR operation
usb: gadget: remove useless depends on Kconfig
usb: gadget: s3c-hsudc: remove the_controller global
usb: gadget: s3c-hsudc: use release_mem_region instead of release_resource
usb: gadget: s3c-hsudc: Add regulator handling
usb: gadget: s3c-hsudc: use udc_start and udc_stop functions
usb: gadget: s3c-hsudc: move device registration to probe
usb: gadget: s3c-hsudc: add missing otg_put_transceiver in probe
usb: gadget: s3c-hsudc: add __devinit to probe function
usb: gadget: s3c-hsudc: move platform_data struct to global header
USB: EHCI: Add Marvell Host Controller driver
USB: OTG: add Marvell usb OTG driver support
usb: gadget: mv_udc: drop ARCH dependency
usb: gadget: mv_udc: fix bug in ep_dequeue
usb: gadget: enlarge maxburst bit width.
...
Diffstat (limited to 'drivers/usb/renesas_usbhs/pipe.c')
| -rw-r--r-- | drivers/usb/renesas_usbhs/pipe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c index c2559e80d41f..feb06d6d2814 100644 --- a/drivers/usb/renesas_usbhs/pipe.c +++ b/drivers/usb/renesas_usbhs/pipe.c @@ -330,8 +330,7 @@ static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe, if (dir_in) usbhsp_flags_set(pipe, IS_DIR_HOST); - if ((is_host && !dir_in) || - (!is_host && dir_in)) + if (!!is_host ^ !!dir_in) dir |= DIR_OUT; if (!dir) |