diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-30 10:16:50 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-30 10:16:50 +1000 |
| commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
| tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /drivers/macintosh/mediabay.c | |
| parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/macintosh/mediabay.c')
| -rw-r--r-- | drivers/macintosh/mediabay.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 82add26cc665..818aba368541 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c @@ -84,7 +84,7 @@ struct media_bay_info { int cd_irq; int cd_retry; #endif -#if defined(CONFIG_BLK_DEV_IDE_PMAC) || defined(CONFIG_MAC_FLOPPY) +#if defined(CONFIG_BLK_DEV_IDE_PMAC) int cd_index; #endif }; @@ -417,6 +417,7 @@ static void poll_media_bay(struct media_bay_info* bay) } } +#ifdef CONFIG_BLK_DEV_IDE_PMAC int check_media_bay(struct device_node *which_bay, int what) { int i; @@ -432,7 +433,6 @@ int check_media_bay(struct device_node *which_bay, int what) } EXPORT_SYMBOL(check_media_bay); -#ifdef CONFIG_BLK_DEV_IDE_PMAC int check_media_bay_by_base(unsigned long base, int what) { int i; @@ -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) { |