lkml.org 
[lkml]   [2017]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.12 21/43] fpga: altera-hps2fpga: fix multiple init of l3_remap_lock
    Date
    4.12-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ian Abbott <abbotti@mev.co.uk>

    commit 4ae2bd4b3ada3dfd80ca8110b4f567752966ca1e upstream.

    The global spinlock `l3_remap_lock` is reinitialized every time the
    "probe" function `alt_fpga_bridge_probe()` is called. It should only be
    initialized once. Use `DEFINE_SPINLOCK()` to initialize it statically.

    Fixes: e5f8efa5c8bf ("ARM: socfpga: fpga bridge driver support")
    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Reviewed-By: Moritz Fischer <mdf@kernel.org>
    Signed-off-by: Alan Tull <atull@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/fpga/altera-hps2fpga.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- a/drivers/fpga/altera-hps2fpga.c
    +++ b/drivers/fpga/altera-hps2fpga.c
    @@ -66,7 +66,7 @@ static int alt_hps2fpga_enable_show(stru

    /* The L3 REMAP register is write only, so keep a cached value. */
    static unsigned int l3_remap_shadow;
    -static spinlock_t l3_remap_lock;
    +static DEFINE_SPINLOCK(l3_remap_lock);

    static int _alt_hps2fpga_enable_set(struct altera_hps2fpga_data *priv,
    bool enable)
    @@ -171,8 +171,6 @@ static int alt_fpga_bridge_probe(struct
    return -EBUSY;
    }

    - spin_lock_init(&l3_remap_lock);
    -
    if (!of_property_read_u32(dev->of_node, "bridge-enable", &enable)) {
    if (enable > 1) {
    dev_warn(dev, "invalid bridge-enable %u > 1\n", enable);

    \
     
     \ /
      Last update: 2017-09-08 15:36    [W:2.877 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site