2018-01-29 06:44:19

by Shunyong Yang

Subject: [PATCH v2] dmaengine: dmatest: fix container_of member in dmatest_callback

The type of arg passed to dmatest_callback is struct dmatest_done.
It refers to test_done in struct dmatest_thread, not done_wait.

Fixes: 6f6a23a213be ("dmaengine: dmatest: move callback wait ...")
Signed-off-by: Yang Shunyong <[email protected]>
Signed-off-by: Vinod Koul <[email protected]>
---

v2: change arg to done in container_of().

---
drivers/dma/dmatest.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index ec5f9d2bc820..80cc2be6483c 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -355,7 +355,7 @@ static void dmatest_callback(void *arg)
{
struct dmatest_done *done = arg;
struct dmatest_thread *thread =
- container_of(arg, struct dmatest_thread, done_wait);
+ container_of(done, struct dmatest_thread, test_done);
if (!thread->done) {
done->done = true;
wake_up_all(done->wait);
--
1.8.3.1

2018-01-29 13:19:30

by Adam Wallis

Subject: Re: [PATCH v2] dmaengine: dmatest: fix container_of member in dmatest_callback

Yang,

On 1/29/2018 1:40 AM, Yang Shunyong wrote:
> The type of arg passed to dmatest_callback is struct dmatest_done.
> It refers to test_done in struct dmatest_thread, not done_wait.
>
> Fixes: 6f6a23a213be ("dmaengine: dmatest: move callback wait ...")
> Signed-off-by: Yang Shunyong <[email protected]>
> Signed-off-by: Vinod Koul <[email protected]>
> ---
>
> v2: change arg to done in container_of().
>
> ---
> drivers/dma/dmatest.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
> index ec5f9d2bc820..80cc2be6483c 100644
> --- a/drivers/dma/dmatest.c
> +++ b/drivers/dma/dmatest.c
> @@ -355,7 +355,7 @@ static void dmatest_callback(void *arg)
> {
> struct dmatest_done *done = arg;
> struct dmatest_thread *thread =
> - container_of(arg, struct dmatest_thread, done_wait);
> + container_of(done, struct dmatest_thread, test_done);
> if (!thread->done) {
> done->done = true;
> wake_up_all(done->wait);
>

Thanks again for the fix (and to Vinod for the cleanup)

Acked-by: Adam Wallis <[email protected]>

--
Adam Wallis
Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.

2018-01-30 06:51:32

by Vinod Koul

Subject: Re: [PATCH v2] dmaengine: dmatest: fix container_of member in dmatest_callback

On Mon, Jan 29, 2018 at 02:40:11PM +0800, Yang Shunyong wrote:
> The type of arg passed to dmatest_callback is struct dmatest_done.
> It refers to test_done in struct dmatest_thread, not done_wait.

Applied, thanks

--
~Vinod