A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] switch cdrom_{open,release,ioctl} to sane APIs

Browse source 
... convert to it in callers

Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
Al Viro 2007-10-07 17:54:28 -04:00
commit bbc1cc9784
7 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/scsi/sr.c
View file

@ -480,7 +480,7 @@ static int sr_block_open(struct inode *inode, struct file *file)
if(!(cd = scsi_cd_get(disk)))
return -ENXIO;
if((ret = cdrom_open(&cd->cdi, inode, file)) != 0)
if((ret = cdrom_open(&cd->cdi, inode->i_bdev, file->f_mode)) != 0)
scsi_cd_put(cd);
return ret;
@ -488,12 +488,8 @@ static int sr_block_open(struct inode *inode, struct file *file)
static int sr_block_release(struct inode *inode, struct file *file)
{
int ret;
struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
ret = cdrom_release(&cd->cdi, file);
if(ret)
return ret;
cdrom_release(&cd->cdi, file ? file->f_mode : 0);
scsi_cd_put(cd);
return 0;
@ -517,7 +513,8 @@ static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
return scsi_ioctl(sdev, cmd, argp);
}
ret = cdrom_ioctl(file, &cd->cdi, inode, cmd, arg);
ret = cdrom_ioctl(&cd->cdi, inode->i_bdev,
file ? file->f_mode : 0, cmd, arg);
if (ret != -ENOSYS)
return ret;