lkml.org 
[lkml]   [2012]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 09/70] [media] ene_ir: Fix driver initialisation
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Luis Henriques <luis.henriques@canonical.com>

    commit b31b021988fed9e3741a46918f14ba9b063811db upstream.

    commit 9ef449c6b31bb6a8e6dedc24de475a3b8c79be20 ("[media] rc: Postpone ISR
    registration") fixed an early ISR registration on several drivers. It did
    however also introduced a bug by moving the invocation of pnp_port_start()
    to the end of the probe function.

    This patch fixes this issue by moving the invocation of pnp_port_start() to
    an earlier stage in the probe function.

    Cc: Jarod Wilson <jarod@redhat.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/media/rc/ene_ir.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
    index bef5296..647dd95 100644
    --- a/drivers/media/rc/ene_ir.c
    +++ b/drivers/media/rc/ene_ir.c
    @@ -1018,6 +1018,8 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)

    spin_lock_init(&dev->hw_lock);

    + dev->hw_io = pnp_port_start(pnp_dev, 0);
    +
    pnp_set_drvdata(pnp_dev, dev);
    dev->pnp_dev = pnp_dev;

    @@ -1072,7 +1074,6 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)

    /* claim the resources */
    error = -EBUSY;
    - dev->hw_io = pnp_port_start(pnp_dev, 0);
    if (!request_region(dev->hw_io, ENE_IO_SIZE, ENE_DRIVER_NAME)) {
    dev->hw_io = -1;
    dev->irq = -1;



    \
     
     \ /
      Last update: 2012-08-07 06:44    [W:2.292 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site