diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /drivers/cdrom/sjcd.c | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'drivers/cdrom/sjcd.c')
| -rw-r--r-- | drivers/cdrom/sjcd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c index 7ea184b5f..f13deeac8 100644 --- a/drivers/cdrom/sjcd.c +++ b/drivers/cdrom/sjcd.c @@ -1413,8 +1413,6 @@ static int sjcd_release( struct inode *inode, struct file *file ){ #endif if( --sjcd_open_count == 0 ){ sjcd_invalidate_buffers(); - sync_dev( inode->i_rdev ); - invalidate_buffers( inode->i_rdev ); s = sjcd_tray_unlock(); if( s < 0 || !sjcd_status_valid || sjcd_command_failed ){ #if defined( SJCD_DIAGNOSTIC ) @@ -1480,6 +1478,7 @@ int __init sjcd_init( void ){ blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), DEVICE_REQUEST); read_ahead[ MAJOR_NR ] = 4; + register_disk(NULL, MKDEV(MAJOR_NR,0), 1, &sjcd_fops, 0); if( check_region( sjcd_base, 4 ) ){ printk( "SJCD: Init failed, I/O port (%X) is already in use\n", |