lkml.org 
[lkml]   [2018]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 086/118] mux: core: fix double get_device()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hans de Goede <hdegoede@redhat.com>

    commit aa1f10e85b0ab53dee85d8e293c8159d18d293a8 upstream.

    class_find_device already does a get_device on the returned device.
    So the device returned by of_find_mux_chip_by_node is already referenced
    and we should not reference it again (and unref it on error).

    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Peter Rosin <peda@axentia.se>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mux/core.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/mux/core.c
    +++ b/drivers/mux/core.c
    @@ -413,6 +413,7 @@ static int of_dev_node_match(struct devi
    return dev->of_node == data;
    }

    +/* Note this function returns a reference to the mux_chip dev. */
    static struct mux_chip *of_find_mux_chip_by_node(struct device_node *np)
    {
    struct device *dev;
    @@ -466,6 +467,7 @@ struct mux_control *mux_control_get(stru
    (!args.args_count && (mux_chip->controllers > 1))) {
    dev_err(dev, "%pOF: wrong #mux-control-cells for %pOF\n",
    np, args.np);
    + put_device(&mux_chip->dev);
    return ERR_PTR(-EINVAL);
    }

    @@ -476,10 +478,10 @@ struct mux_control *mux_control_get(stru
    if (controller >= mux_chip->controllers) {
    dev_err(dev, "%pOF: bad mux controller %u specified in %pOF\n",
    np, controller, args.np);
    + put_device(&mux_chip->dev);
    return ERR_PTR(-EINVAL);
    }

    - get_device(&mux_chip->dev);
    return &mux_chip->mux[controller];
    }
    EXPORT_SYMBOL_GPL(mux_control_get);

    \
     
     \ /
      Last update: 2018-01-15 13:56    [W:4.065 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site