Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7c31d2f59c14191c3251f18ad1782fe6692f0c33
Commit:     7c31d2f59c14191c3251f18ad1782fe6692f0c33
Parent:     80581c43d02f66afb2cafa44bef710a2549a1748
Author:     Bjorn Helgaas <[EMAIL PROTECTED]>
AuthorDate: Wed Jun 27 14:09:50 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Jun 28 11:34:53 2007 -0700

    smsc-ircc2: skip preconfiguration for PNP devices
    
    If we rely on the device resources from PNPBIOS, we also have to rely on
    the BIOS to configure any bridges on the way to the device.
    
    Using the PNPBIOS resources but changing the configuration of a bridge
    behind the back of the firmware is likely to make things inconsistent.
    
    This patch addresses part of the 2.6.22 regression:
        "no irda0 interface (2.6.21 was OK), smsc does not find chip"
    It fixes smsc-ircc2 PNP device detection on HP nx5000 laptops.
    Other laptops, including HP nc6000, HP nc8000, HP nw8000, and Toshiba
    Portege 4000, still need PNP quirks to make this work.
    
    With "smsc-ircc2.nopnp", we do the legacy device probe, including manual
    bridge preconfiguration, as before.
    
    Signed-off-by: Bjorn Helgaas <[EMAIL PROTECTED]>
    Cc: Samuel Ortiz <[EMAIL PROTECTED]>
    Acked-by: "Linus Walleij (LD/EAB)" <[EMAIL PROTECTED]>
    Cc: Andrey Borzenkov <[EMAIL PROTECTED]>
    Cc: Michal Piotrowski <[EMAIL PROTECTED]>
    Cc: "David S. Miller" <[EMAIL PROTECTED]>
    Cc: Adam Belay <[EMAIL PROTECTED]>
    Cc: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/net/irda/smsc-ircc2.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 9043bf4..2803b37 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -416,6 +416,13 @@ static int __init smsc_ircc_legacy_probe(void)
 {
        int ret = 0;
 
+#ifdef CONFIG_PCI
+       if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, 
ircc_dma, ircc_irq) < 0) {
+               /* Ignore errors from preconfiguration */
+               IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name);
+       }
+#endif
+
        if (ircc_fir > 0 && ircc_sir > 0) {
                IRDA_MESSAGE(" Overriding FIR address 0x%04x\n", ircc_fir);
                IRDA_MESSAGE(" Overriding SIR address 0x%04x\n", ircc_sir);
@@ -459,13 +466,6 @@ static int __init smsc_ircc_init(void)
                return ret;
        }
 
-#ifdef CONFIG_PCI
-       if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, 
ircc_dma, ircc_irq) < 0) {
-               /* Ignore errors from preconfiguration */
-               IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name);
-       }
-#endif
-
        dev_count = 0;
 
        if (smsc_nopnp || !pnp_platform_devices ||
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to