diff options
Diffstat (limited to 'drivers/cdrom/cdrom.c')
-rw-r--r-- | drivers/cdrom/cdrom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 71d1b9bab70b..614da5b8613a 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
@@ -3412,7 +3412,7 @@ static int cdrom_print_info(const char *header, int val, char *info, | |||
3412 | return 0; | 3412 | return 0; |
3413 | } | 3413 | } |
3414 | 3414 | ||
3415 | static int cdrom_sysctl_info(ctl_table *ctl, int write, struct file * filp, | 3415 | static int cdrom_sysctl_info(ctl_table *ctl, int write, |
3416 | void __user *buffer, size_t *lenp, loff_t *ppos) | 3416 | void __user *buffer, size_t *lenp, loff_t *ppos) |
3417 | { | 3417 | { |
3418 | int pos; | 3418 | int pos; |
@@ -3489,7 +3489,7 @@ static int cdrom_sysctl_info(ctl_table *ctl, int write, struct file * filp, | |||
3489 | goto done; | 3489 | goto done; |
3490 | doit: | 3490 | doit: |
3491 | mutex_unlock(&cdrom_mutex); | 3491 | mutex_unlock(&cdrom_mutex); |
3492 | return proc_dostring(ctl, write, filp, buffer, lenp, ppos); | 3492 | return proc_dostring(ctl, write, buffer, lenp, ppos); |
3493 | done: | 3493 | done: |
3494 | printk(KERN_INFO "cdrom: info buffer too small\n"); | 3494 | printk(KERN_INFO "cdrom: info buffer too small\n"); |
3495 | goto doit; | 3495 | goto doit; |
@@ -3525,12 +3525,12 @@ static void cdrom_update_settings(void) | |||
3525 | mutex_unlock(&cdrom_mutex); | 3525 | mutex_unlock(&cdrom_mutex); |
3526 | } | 3526 | } |
3527 | 3527 | ||
3528 | static int cdrom_sysctl_handler(ctl_table *ctl, int write, struct file * filp, | 3528 | static int cdrom_sysctl_handler(ctl_table *ctl, int write, |
3529 | void __user *buffer, size_t *lenp, loff_t *ppos) | 3529 | void __user *buffer, size_t *lenp, loff_t *ppos) |
3530 | { | 3530 | { |
3531 | int ret; | 3531 | int ret; |
3532 | 3532 | ||
3533 | ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos); | 3533 | ret = proc_dointvec(ctl, write, buffer, lenp, ppos); |
3534 | 3534 | ||
3535 | if (write) { | 3535 | if (write) { |
3536 | 3536 | ||