diff options
| author | Ingo Molnar <[email protected]> | 2015-01-28 14:30:32 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-01-28 14:30:32 +0000 |
| commit | 41ca5d4e9be11ea6ae040b51d9628a189fd82896 (patch) | |
| tree | f9c35cc37b9622f6cccd91b94548f44b9a534029 /drivers/usb/musb/musb_cppi41.c | |
| parent | x86_64 entry: Fix RCX for ptraced syscalls (diff) | |
| parent | x86, tls: Interpret an all-zero struct user_desc as "no segment" (diff) | |
| download | kernel-41ca5d4e9be11ea6ae040b51d9628a189fd82896.tar.gz kernel-41ca5d4e9be11ea6ae040b51d9628a189fd82896.zip | |
Merge commit 3669ef9fa7d3 ("x86, tls: Interpret an all-zero struct user_desc as 'no segment'") into x86/asm
Pick up the latestest asm fixes before advancing it any further.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/usb/musb/musb_cppi41.c')
| -rw-r--r-- | drivers/usb/musb/musb_cppi41.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c index f64fd964dc6d..c39a16ad7832 100644 --- a/drivers/usb/musb/musb_cppi41.c +++ b/drivers/usb/musb/musb_cppi41.c @@ -628,9 +628,9 @@ static int cppi41_dma_controller_start(struct cppi41_dma_controller *controller) ret = of_property_read_string_index(np, "dma-names", i, &str); if (ret) goto err; - if (!strncmp(str, "tx", 2)) + if (strstarts(str, "tx")) is_tx = 1; - else if (!strncmp(str, "rx", 2)) + else if (strstarts(str, "rx")) is_tx = 0; else { dev_err(dev, "Wrong dmatype %s\n", str); |