diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-10 18:32:13 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-10 18:32:13 -0500 |
commit | c92a7f1d8254fabd99df33af59094935fc2cfe32 (patch) | |
tree | abf6a9258a7f45d344a323790ded288f71e1b45a /drivers/ide | |
parent | d4452be757b5b94b2d39c5c254743caee913915e (diff) |
palm_bk3710: port initialization/probing bugfix
Probe port _after_ it is fully initialized.
Cc: Anton Salnikov <asalnikov@ru.mvista.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/arm/palm_bk3710.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c index 0ce95c1ba7e1..8e40bdbc3970 100644 --- a/drivers/ide/arm/palm_bk3710.c +++ b/drivers/ide/arm/palm_bk3710.c | |||
@@ -370,13 +370,6 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) | |||
370 | ide_init_port_hw(hwif, &hw); | 370 | ide_init_port_hw(hwif, &hw); |
371 | hwif->quirkproc = NULL; | 371 | hwif->quirkproc = NULL; |
372 | 372 | ||
373 | idx[0] = i; | ||
374 | |||
375 | ide_device_add(idx, NULL); | ||
376 | |||
377 | if (!hwif->present) | ||
378 | goto out; | ||
379 | |||
380 | hwif->set_pio_mode = &palm_bk3710_set_pio_mode; | 373 | hwif->set_pio_mode = &palm_bk3710_set_pio_mode; |
381 | hwif->set_dma_mode = &palm_bk3710_set_dma_mode; | 374 | hwif->set_dma_mode = &palm_bk3710_set_dma_mode; |
382 | hwif->mmio = 1; | 375 | hwif->mmio = 1; |
@@ -390,6 +383,13 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) | |||
390 | 383 | ||
391 | ide_setup_dma(hwif, mem->start); | 384 | ide_setup_dma(hwif, mem->start); |
392 | 385 | ||
386 | idx[0] = i; | ||
387 | |||
388 | ide_device_add(idx, NULL); | ||
389 | |||
390 | if (!hwif->present) | ||
391 | goto out; | ||
392 | |||
393 | return 0; | 393 | return 0; |
394 | out: | 394 | out: |
395 | printk(KERN_WARNING "Palm Chip BK3710 IDE Register Fail\n"); | 395 | printk(KERN_WARNING "Palm Chip BK3710 IDE Register Fail\n"); |