lkml.org 
[lkml]   [2006]   [Nov]   [1]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    DateTue, 31 Oct 2006 21:34:37 -0800
    FromChris Wright <>
    Subject[PATCH 57/61] JMB 368 PATA detection
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------
    From: Alan Cox <alan@lxorguk.ukuu.org.uk>
    
    The Jmicron JMB368 is PATA only so has the PATA on function zero.  Don't
    therefore skip function zero on this device when probing
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
     drivers/ide/pci/generic.c |    6 ++++--
     1 file changed, 4 insertions(+), 2 deletions(-)
    --- linux-2.6.18.1.orig/drivers/ide/pci/generic.c
    +++ linux-2.6.18.1/drivers/ide/pci/generic.c
    @@ -242,8 +242,10 @@ static int __devinit generic_init_one(st
     	    (!(PCI_FUNC(dev->devfn) & 1)))
     		goto out;
     
    -	if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1)
    -		goto out;
    +	if (dev->vendor == PCI_VENDOR_ID_JMICRON) {
    +		if (dev->device != PCI_DEVICE_ID_JMICRON_JMB368 && PCI_FUNC(dev->devfn) != 1)
    +			goto out;
    +	}
     
     	if (dev->vendor != PCI_VENDOR_ID_JMICRON) {
     		pci_read_config_word(dev, PCI_COMMAND, &command);
    --
    -
    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-11-01 06:53    [from the cache]
    ©2003-2008