patch-2.2.13 linux/drivers/block/ide-pmac.c

Next file: linux/drivers/block/ide.c
Previous file: linux/drivers/block/ide-cd.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.12/linux/drivers/block/ide-pmac.c linux/drivers/block/ide-pmac.c
@@ -462,8 +462,10 @@
 				continue;
 			/* Disable irq during sleep */
 			disable_irq(pmac_ide_irq[i]);
-			/* Put the disk to sleep */
-			idepmac_sleep_disk(i, base);
+			ret = check_media_bay_by_base(base, MB_CD);
+			if (ret == -ENODEV)
+				/* not media bay - put the disk to sleep */
+				idepmac_sleep_disk(i, base);
 		}
 		break;
 	case PBOOK_WAKE:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)