patch-2.1.70 linux/drivers/scsi/sr_vendor.c

Next file: linux/drivers/sound/lowlevel/awe_wave.c
Previous file: linux/drivers/scsi/sr_ioctl.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.69/linux/drivers/scsi/sr_vendor.c linux/drivers/scsi/sr_vendor.c
@@ -44,7 +44,6 @@
 #include <scsi/scsi_ioctl.h>
 
 #include <linux/cdrom.h>
-#include <linux/ucdrom.h>
 #include "sr.h"
 
 #if 0
@@ -231,7 +230,7 @@
 		frame  = BCD_TO_BIN(buffer[3]);
 		sector = min*CD_SECS*CD_FRAMES + sec*CD_FRAMES + frame;
 		if (sector)
-			sector -= CD_BLOCK_OFFSET;
+			sector -= CD_MSF_OFFSET;
 		break;
 
 	case VENDOR_HP_4020:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov