lkml.org 
[lkml]   [2006]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 63/67] ide-generic: jmicron fix

    -stable review patch. If anyone has any objections, please let us know.

    ------------------
    From: Alan Cox <alan@lxorguk.ukuu.org.uk>

    Some people find their Jmicron pata port reports its disabled even
    though it has devices on it and was boot probed. Fix this

    (Candidate for 2.6.18.*, less so for 2.6.19 as we've got a proper
    jmicron driver on the merge for that to replace ide-generic support)

    From: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


    ---
    drivers/ide/pci/generic.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- linux-2.6.18.orig/drivers/ide/pci/generic.c
    +++ linux-2.6.18/drivers/ide/pci/generic.c
    @@ -245,10 +245,12 @@ static int __devinit generic_init_one(st
    if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1)
    goto out;

    - pci_read_config_word(dev, PCI_COMMAND, &command);
    - if (!(command & PCI_COMMAND_IO)) {
    - printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
    - goto out;
    + if (dev->vendor != PCI_VENDOR_ID_JMICRON) {
    + pci_read_config_word(dev, PCI_COMMAND, &command);
    + if (!(command & PCI_COMMAND_IO)) {
    + printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);
    + goto out;
    + }
    }
    ret = ide_setup_pci_device(dev, d);
    out:
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-10-11 23:15    [W:0.021 / U:0.580 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site