patch-2.3.40 linux/drivers/cdrom/sonycd535.c

Next file: linux/drivers/char/Config.in
Previous file: linux/drivers/cdrom/sjcd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.39/linux/drivers/cdrom/sonycd535.c linux/drivers/cdrom/sonycd535.c
@@ -798,9 +798,6 @@
 	Byte status[2];
 	Byte cmd[2];
 
-	if (!sony_inuse) {
-		cdu_open(NULL, NULL);
-	}
 	while (1) {
 		/*
 		 * The beginning here is stolen from the hard disk driver.  I hope
@@ -1396,7 +1393,6 @@
 {
 	Byte status[2], cmd_buff[2];
 
-
 	if (sony_inuse)
 		return -EBUSY;
 	if (check_drive_status() != 0)
@@ -1638,6 +1634,7 @@
 		return -EIO;
 	}
 	request_region(sony535_cd_base_io, 4, CDU535_HANDLE);
+	register_disk(NULL, MKDEV(MAJOR_NR,0), 1, &cdu_fops, 0);
 	return 0;
 }
 

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