patch-2.1.118 linux/drivers/cdrom/sbpcd.c

• Lines: 28
• Date: Sat Aug 22 12:33:04 1998
• Orig file: v2.1.117/linux/drivers/cdrom/sbpcd.c
• Orig date: Sun Jun 7 11:16:29 1998

diff -u --recursive --new-file v2.1.117/linux/drivers/cdrom/sbpcd.c linux/drivers/cdrom/sbpcd.c
@@ -4540,7 +4540,7 @@
 		/* resume playing audio tracks when a previous PLAY AUDIO call has  */
 		/* been paused with a PAUSE command.                                */
 		/* It will resume playing from the location saved in SubQ_run_tot.  */
-		if (D_S[d].audio_state!=audio_pausing) return -EINVAL;
+		if (D_S[d].audio_state!=audio_pausing) RETURN_UP(-EINVAL);
 		if (famL_drive)
 			i=cc_PlayAudio(D_S[d].pos_audio_start,
 				       D_S[d].pos_audio_end);
@@ -4654,7 +4654,9 @@
 #endif SAFE_MIXED
 		i=cc_Pause_Resume(1);
 		D_S[d].audio_state=0;
+#if 0
 		cc_DriveReset();
+#endif
 		RETURN_UP(i);
 		
 	case CDROMSTART:  /* Spin up the drive */
@@ -4676,7 +4678,7 @@
 	case CDROMVOLREAD:   /* read Volume settings from drive */
 		msg(DBG_IOC,"ioctl: CDROMVOLREAD entered.\n");
 		st=cc_GetVolume();
-		if (st<0) return (st);
+		if (st<0) RETURN_UP(st);
 		volctrl.channel0=D_S[d].vol_ctrl0;
 		volctrl.channel1=D_S[d].vol_ctrl1;
 		volctrl.channel2=0;