diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-25 13:22:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-25 13:22:05 +0200 |
| commit | 344235f55707f6f7538378e9790cec58e86ebbca (patch) | |
| tree | 8c4f41904450e9b929c162a32faf6141ff26ce75 /drivers/dma/dmatest.c | |
| parent | sc16is7xx: Read the LSR register for basic device presence check (diff) | |
| parent | Linux 5.7-rc7 (diff) | |
| download | linux-344235f55707f6f7538378e9790cec58e86ebbca.tar.xz linux-344235f55707f6f7538378e9790cec58e86ebbca.zip | |
Merge 5.7-rc7 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dma/dmatest.c')
| -rw-r--r-- | drivers/dma/dmatest.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 364dd34799d4..0425984db118 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c @@ -1166,10 +1166,11 @@ static int dmatest_run_set(const char *val, const struct kernel_param *kp) mutex_unlock(&info->lock); return ret; } else if (dmatest_run) { - if (is_threaded_test_pending(info)) - start_threaded_tests(info); - else - pr_info("Could not start test, no channels configured\n"); + if (!is_threaded_test_pending(info)) { + pr_info("No channels configured, continue with any\n"); + add_threaded_test(info); + } + start_threaded_tests(info); } else { stop_threaded_test(info); } |