lkml.org 
[lkml]   [2016]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/5] [media] winbond-cir: Move a variable assignment in wbcir_tx()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Fri, 14 Oct 2016 07:34:46 +0200

    Move the assignment for the local variable "data" behind the source code
    for a memory allocation by this function.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/media/rc/winbond-cir.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
    index 59050f5..fd997f0 100644
    --- a/drivers/media/rc/winbond-cir.c
    +++ b/drivers/media/rc/winbond-cir.c
    @@ -655,7 +655,7 @@ wbcir_txmask(struct rc_dev *dev, u32 mask)
    static int
    wbcir_tx(struct rc_dev *dev, unsigned *b, unsigned count)
    {
    - struct wbcir_data *data = dev->priv;
    + struct wbcir_data *data;
    unsigned *buf;
    unsigned i;
    unsigned long flags;
    @@ -668,6 +668,7 @@ wbcir_tx(struct rc_dev *dev, unsigned *b, unsigned count)
    for (i = 0; i < count; i++)
    buf[i] = DIV_ROUND_CLOSEST(b[i], 10);

    + data = dev->priv;
    /* Not sure if this is possible, but better safe than sorry */
    spin_lock_irqsave(&data->spinlock, flags);
    if (data->txstate != WBCIR_TXSTATE_INACTIVE) {
    --
    2.10.1
    \
     
     \ /
      Last update: 2016-10-14 13:45    [W:4.023 / U:1.952 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site