lkml.org 
[lkml]   [2011]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[16/17] Staging: comedi: jr3_pci: Dont ioremap too much space. Check result.
    2.6.32-longterm review patch.  If anyone has any objections, please let us know.

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

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

    commit fa5c5f4ce0c9ba03a670c640cad17e14cb35678b upstream.

    For the JR3/PCI cards, the size of the PCIBAR0 region depends on the
    number of channels. Don't try and ioremap space for 4 channels if the
    card has fewer channels. Also check for ioremap failure.

    Thanks to Anders Blomdell for input and Sami Hussein for testing.

    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/staging/comedi/drivers/jr3_pci.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/drivers/staging/comedi/drivers/jr3_pci.c
    +++ b/drivers/staging/comedi/drivers/jr3_pci.c
    @@ -856,8 +856,11 @@ static int jr3_pci_attach(struct comedi_
    }

    devpriv->pci_enabled = 1;
    - devpriv->iobase =
    - ioremap(pci_resource_start(card, 0), sizeof(struct jr3_t));
    + devpriv->iobase = ioremap(pci_resource_start(card, 0),
    + offsetof(struct jr3_t, channel[devpriv->n_channels]));
    + if (!devpriv->iobase)
    + return -ENOMEM;
    +
    result = alloc_subdevices(dev, devpriv->n_channels);
    if (result < 0)
    goto out;



    \
     
     \ /
      Last update: 2011-03-11 21:47    [W:0.021 / U:1.408 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site