lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 180/222] media: pxa_camera: Fix check for pdev->dev.of_node
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit 44d7f1a77d8c84f8e42789b5475b74ae0e6d4758 ]

    Clang warns that the address of a pointer will always evaluated as true
    in a boolean context.

    drivers/media/platform/pxa_camera.c:2400:17: warning: address of
    'pdev->dev.of_node' will always evaluate to 'true'
    [-Wpointer-bool-conversion]
    if (&pdev->dev.of_node && !pcdev->pdata) {
    ~~~~~~~~~~^~~~~~~ ~~
    1 warning generated.

    Judging from the rest of the kernel, it seems like this was an error and
    just the value of of_node should be checked rather than the address.

    Reported-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/pxa_camera.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c
    index 390d708c807a0..3fab9f776afa7 100644
    --- a/drivers/media/platform/pxa_camera.c
    +++ b/drivers/media/platform/pxa_camera.c
    @@ -2334,7 +2334,7 @@ static int pxa_camera_probe(struct platform_device *pdev)
    pcdev->res = res;

    pcdev->pdata = pdev->dev.platform_data;
    - if (&pdev->dev.of_node && !pcdev->pdata) {
    + if (pdev->dev.of_node && !pcdev->pdata) {
    err = pxa_camera_pdata_from_dt(&pdev->dev, pcdev, &pcdev->asd);
    } else {
    pcdev->platform_flags = pcdev->pdata->flags;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-22 11:47    [W:4.058 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site