diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-15 16:53:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-15 16:53:33 -0700 |
| commit | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (patch) | |
| tree | a1c286887f60482325a6b18d9ca4373b5e9428bd /drivers/macintosh/mediabay.c | |
| parent | b92dea67cc66970cda6b5b11895d08e35b4618e7 (diff) | |
| parent | 0cbccbc30a60ff60dbeb203154f1f527c632de9b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6tip-x86-delay-2008-06-23_09.02_Montip-sched-2008-06-16_09.25_Montip-sched-2008-06-16_09.15_Montip-pci-for-jesse-2008-06-16_09.25_Montip-mm-xen-2008-06-23_08.59_Mon
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-generic: don't probe all legacy ISA IDE ports by default
ide-cs: fix releasing I/O resources
ide-cs: fix probing and add warm-plug support
ide-pmac: remove bogus comment about pmac_ide_setup_device()
ide-pmac: add ->cable_detect method
ide-pmac: bugfix for media-bay support rework
opti621: add PIO 4 support
opti621: use pre-calculated PIO timings
opti621: program devices timings separately in ->set_pio_mode
opti621: use PCI clock value provided by controller
opti621: remove DMA support
opti621: disable read prefetch
Diffstat (limited to 'drivers/macintosh/mediabay.c')
| -rw-r--r-- | drivers/macintosh/mediabay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 82add26cc665..c34bdf852e32 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c @@ -556,7 +556,8 @@ static void media_bay_step(int i) printk("mediabay %d, registering IDE...\n", i); pmu_suspend(); ide_port_scan(bay->cd_port); - bay->cd_index = bay->cd_port->index; + if (bay->cd_port->present) + bay->cd_index = bay->cd_port->index; pmu_resume(); } if (bay->cd_index == -1) { |