diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | 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 9043bf4aa49e..2803b370ba01 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) | |||
416 | { | 416 | { |
417 | int ret = 0; | 417 | int ret = 0; |
418 | 418 | ||
419 | #ifdef CONFIG_PCI | ||
420 | if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, ircc_dma, ircc_irq) < 0) { | ||
421 | /* Ignore errors from preconfiguration */ | ||
422 | IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name); | ||
423 | } | ||
424 | #endif | ||
425 | |||
419 | if (ircc_fir > 0 && ircc_sir > 0) { | 426 | if (ircc_fir > 0 && ircc_sir > 0) { |
420 | IRDA_MESSAGE(" Overriding FIR address 0x%04x\n", ircc_fir); | 427 | IRDA_MESSAGE(" Overriding FIR address 0x%04x\n", ircc_fir); |
421 | IRDA_MESSAGE(" Overriding SIR address 0x%04x\n", ircc_sir); | 428 | IRDA_MESSAGE(" Overriding SIR address 0x%04x\n", ircc_sir); |
@@ -459,13 +466,6 @@ static int __init smsc_ircc_init(void) | |||
459 | return ret; | 466 | return ret; |
460 | } | 467 | } |
461 | 468 | ||
462 | #ifdef CONFIG_PCI | ||
463 | if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, ircc_dma, ircc_irq) < 0) { | ||
464 | /* Ignore errors from preconfiguration */ | ||
465 | IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name); | ||
466 | } | ||
467 | #endif | ||
468 | |||
469 | dev_count = 0; | 469 | dev_count = 0; |
470 | 470 | ||
471 | if (smsc_nopnp || !pnp_platform_devices || | 471 | if (smsc_nopnp || !pnp_platform_devices || |