git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
cdrom
/
sjcd.c
diff --git
a/drivers/cdrom/sjcd.c
b/drivers/cdrom/sjcd.c
index
f444b25
..
bf5aef4
100644
(file)
--- a/
drivers/cdrom/sjcd.c
+++ b/
drivers/cdrom/sjcd.c
@@
-151,7
+151,7
@@
static struct sjcd_stat statistic;
/*
* Timer.
*/
/*
* Timer.
*/
-static
struct timer_list sjcd_delay_timer = TIMER_INITIALIZER(
NULL, 0, 0);
+static
DEFINE_TIMER(sjcd_delay_timer,
NULL, 0, 0);
#define SJCD_SET_TIMER( func, tmout ) \
( sjcd_delay_timer.expires = jiffies+tmout, \
#define SJCD_SET_TIMER( func, tmout ) \
( sjcd_delay_timer.expires = jiffies+tmout, \
@@
-831,8
+831,8
@@
static int sjcd_ioctl(struct inode *ip, struct file *fp,
printk("SJCD: ioctl: playmsf\n");
#endif
if ((s =
printk("SJCD: ioctl: playmsf\n");
#endif
if ((s =
- verify_area(VERIFY_READ, argp,
-
sizeof(sjcd_msf))
) == 0) {
+ access_ok(VERIFY_READ, argp, sizeof(sjcd_msf))
+
? 0 : -EFAULT
) == 0) {
if (sjcd_audio_status == CDROM_AUDIO_PLAY) {
sjcd_send_cmd(SCMD_PAUSE);
(void) sjcd_receive_status();
if (sjcd_audio_status == CDROM_AUDIO_PLAY) {
sjcd_send_cmd(SCMD_PAUSE);
(void) sjcd_receive_status();
@@
-888,8
+888,8
@@
static int sjcd_ioctl(struct inode *ip, struct file *fp,
printk("SJCD: ioctl: readtocentry\n");
#endif
if ((s =
printk("SJCD: ioctl: readtocentry\n");
#endif
if ((s =
- verify_area(VERIFY_WRITE, argp,
-
sizeof(toc_entry))
) == 0) {
+ access_ok(VERIFY_WRITE, argp, sizeof(toc_entry))
+
? 0 : -EFAULT
) == 0) {
struct sjcd_hw_disk_info *tp;
if (copy_from_user(&toc_entry, argp,
struct sjcd_hw_disk_info *tp;
if (copy_from_user(&toc_entry, argp,
@@
-943,8
+943,8
@@
static int sjcd_ioctl(struct inode *ip, struct file *fp,
printk("SJCD: ioctl: subchnl\n");
#endif
if ((s =
printk("SJCD: ioctl: subchnl\n");
#endif
if ((s =
- verify_area(VERIFY_WRITE, argp,
-
sizeof(subchnl))
) == 0) {
+ access_ok(VERIFY_WRITE, argp, sizeof(subchnl))
+
? 0 : -EFAULT
) == 0) {
struct sjcd_hw_qinfo q_info;
if (copy_from_user(&subchnl, argp,
struct sjcd_hw_qinfo q_info;
if (copy_from_user(&subchnl, argp,
@@
-1002,8
+1002,8
@@
static int sjcd_ioctl(struct inode *ip, struct file *fp,
printk("SJCD: ioctl: volctrl\n");
#endif
if ((s =
printk("SJCD: ioctl: volctrl\n");
#endif
if ((s =
- verify_area(VERIFY_READ, argp,
-
sizeof(vol_ctrl))
) == 0) {
+ access_ok(VERIFY_READ, argp, sizeof(vol_ctrl))
+
? 0 : -EFAULT
) == 0) {
unsigned char dummy[4];
if (copy_from_user(&vol_ctrl, argp,
unsigned char dummy[4];
if (copy_from_user(&vol_ctrl, argp,
@@
-1695,7
+1695,6
@@
static int __init sjcd_init(void)
sjcd_disk->first_minor = 0,
sjcd_disk->fops = &sjcd_fops,
sprintf(sjcd_disk->disk_name, "sjcd");
sjcd_disk->first_minor = 0,
sjcd_disk->fops = &sjcd_fops,
sprintf(sjcd_disk->disk_name, "sjcd");
- sprintf(sjcd_disk->devfs_name, "sjcd");
if (!request_region(sjcd_base, 4,"sjcd")) {
printk
if (!request_region(sjcd_base, 4,"sjcd")) {
printk