lkml.org 
[lkml]   [2017]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 2/3] Input: twl6040-vibra: fix child-node lookup
    From
    Date


    On 2017-11-11 17:43, Johan Hovold wrote:
    > Fix child-node lookup during probe, which ended up searching the whole
    > device tree depth-first starting at parent rather than just matching on
    > its children.
    >
    > Later sanity checks on node properties (which would likely be missing)
    > should prevent this from causing much trouble however, especially as the
    > original premature free of the parent node has already been fixed
    > separately (but that "fix" was apparently never backported to stable).
    >
    > Fixes: e7ec014a47e4 ("Input: twl6040-vibra - update for device tree support")
    > Fixes: c52c545ead97 ("Input: twl6040-vibra - fix DT node memory management")
    > Cc: stable <stable@vger.kernel.org> # 3.6
    > Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
    > Cc: H. Nikolaus Schaller <hns@goldelico.com>
    > Signed-off-by: Johan Hovold <johan@kernel.org>

    Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

    > ---
    > drivers/input/misc/twl6040-vibra.c | 3 +--
    > 1 file changed, 1 insertion(+), 2 deletions(-)
    >
    > diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
    > index 5690eb7ff954..15e0d352c4cc 100644
    > --- a/drivers/input/misc/twl6040-vibra.c
    > +++ b/drivers/input/misc/twl6040-vibra.c
    > @@ -248,8 +248,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
    > int vddvibr_uV = 0;
    > int error;
    >
    > - of_node_get(twl6040_core_dev->of_node);
    > - twl6040_core_node = of_find_node_by_name(twl6040_core_dev->of_node,
    > + twl6040_core_node = of_get_child_by_name(twl6040_core_dev->of_node,
    > "vibra");
    > if (!twl6040_core_node) {
    > dev_err(&pdev->dev, "parent of node is missing?\n");
    >

    - Péter

    Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
    Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

    \
     
     \ /
      Last update: 2017-11-13 08:17    [W:2.809 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site