- Merge with Linux 2.1.121.

 - Bugfixes.

8 files changed, 17 insertions, 6 deletions

diff --git a/drivers/cdrom/Makefile b/drivers/cdrom/Makefile
index 00cb2cda2..025b25a7a 100644
--- a/drivers/cdrom/Makefile
+++ b/drivers/cdrom/Makefile
@@ -25,6 +25,7 @@ obj-		:=
 
 obj-$(CONFIG_BLK_DEV_IDECD)	+=              cdrom.o
 obj-$(CONFIG_BLK_DEV_SR)	+=              cdrom.o
+obj-$(CONFIG_PARIDE_PCD)	+=		cdrom.o
 
 obj-$(CONFIG_AZTCD)		+= aztcd.o
 obj-$(CONFIG_CDU31A)		+= cdu31a.o     cdrom.o
diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index 0d8848fdc..0342a5381 100644
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -379,6 +379,7 @@ static struct file_operations azt_fops = {
 	aztcd_ioctl,            /* ioctl */
 	NULL,                   /* mmap */
 	aztcd_open,             /* open */
+	NULL,			/* flush */
 	aztcd_release,          /* release */
 	NULL,                   /* fsync */
 	NULL,                   /* fasync*/
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index a2806b858..b31ef1ed6 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -76,7 +76,7 @@
   of the drive.  Thanks to Tobias Ringstr|m <tori@prosolvia.se> for pointing
   this out and providing a simple fix.
   -- Fixed the procfs-unload-module bug with the fill_inode procfs callback.
-  thanks to Andrea Arcangeli <arcangeli@mbox.queen.it>
+  thanks to Andrea Arcangeli
   -- Fixed it so that the /proc entry now also shows up when cdrom is
   compiled into the kernel.  Before it only worked when loaded as a module.
 
@@ -184,6 +184,7 @@ struct file_operations cdrom_fops =
 	cdrom_ioctl,                    /* ioctl */
 	NULL,                           /* mmap */
 	cdrom_open,                     /* open */
+	NULL,				/* flush */
 	cdrom_release,                  /* release */
 	NULL,                           /* fsync */
 	NULL,                           /* fasync */
@@ -1081,10 +1082,12 @@ static void cdrom_sysctl_register(void)
 	initialized = 1;
 }
 
+#ifdef MODULE
 static void cdrom_sysctl_unregister(void)
 {
 	unregister_sysctl_table(cdrom_sysctl_header);
 }
+#endif /* endif MODULE */
 #endif /* endif CONFIG_SYSCTL */
 
 #ifdef MODULE
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index 3fad59c73..ea3f9093c 100644
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -160,6 +160,7 @@ static struct file_operations gscd_fops = {
 	gscd_ioctl,		/* ioctl */
 	NULL,			/* mmap */
 	gscd_open,		/* open */
+	NULL,			/* flush */
 	gscd_release,		/* release */
 	NULL,                   /* fsync */
 	NULL,                   /* fasync*/
diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c
index eae60ad3c..76103945b 100644
--- a/drivers/cdrom/optcd.c
+++ b/drivers/cdrom/optcd.c
@@ -2008,6 +2008,7 @@ static struct file_operations opt_fops = {
 	opt_ioctl,		/* ioctl */
 	NULL,			/* mmap */
 	opt_open,		/* open */
+	NULL,			/* flush */
 	opt_release,		/* release */
 	NULL,			/* fsync */
 	NULL,			/* fasync */
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index 428964d8f..11b99e645 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -4540,7 +4540,7 @@ static int sbpcd_audio_ioctl(struct cdrom_device_info *cdi, u_int cmd,
 		/* 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 @@ static int sbpcd_audio_ioctl(struct cdrom_device_info *cdi, u_int cmd,
 #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 @@ static int sbpcd_audio_ioctl(struct cdrom_device_info *cdi, u_int cmd,
 	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;
diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index dc6e243f1..6681f2a19 100644
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -1429,6 +1429,7 @@ static struct file_operations sjcd_fops = {
   sjcd_ioctl,         /* ioctl */
   NULL,               /* mmap */
   sjcd_open,          /* open */
+  NULL,		      /* flush */
   sjcd_release,       /* release */
   NULL,               /* fsync */
   NULL,               /* fasync */
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index 52e64890e..aaad43c96 100644
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -1469,16 +1469,17 @@ static struct file_operations cdu_fops =
 {
 	NULL,						/* lseek - default */
 	block_read,					/* read - general block-dev read */
-	block_write,				/* write - general block-dev write */
+	block_write,					/* write - general block-dev write */
 	NULL,						/* readdir - bad */
 	NULL,						/* poll */
 	cdu_ioctl,					/* ioctl */
 	NULL,						/* mmap */
 	cdu_open,					/* open */
-	cdu_release,				/* release */
+	NULL,						/* flush */
+	cdu_release,					/* release */
 	NULL,						/* fsync */
 	NULL,						/* fasync */
-	cdu535_check_media_change,	/* check media change */
+	cdu535_check_media_change,			/* check media change */
 	NULL						/* revalidate */
 };