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
/
optcd.c
diff --git
a/drivers/cdrom/optcd.c
b/drivers/cdrom/optcd.c
index
0b0eab4
..
3541690
100644
(file)
--- a/
drivers/cdrom/optcd.c
+++ b/
drivers/cdrom/optcd.c
@@
-101,7
+101,7
@@
static void debug(int debug_this, const char* fmt, ...)
return;
va_start(args, fmt);
return;
va_start(args, fmt);
- vs
printf(s
, fmt, args);
+ vs
nprintf(s, sizeof(s)
, fmt, args);
printk(KERN_DEBUG "optcd: %s\n", s);
va_end(args);
}
printk(KERN_DEBUG "optcd: %s\n", s);
va_end(args);
}
@@
-2033,7
+2033,6
@@
static int __init optcd_init(void)
optcd_disk->first_minor = 0;
optcd_disk->fops = &opt_fops;
sprintf(optcd_disk->disk_name, "optcd");
optcd_disk->first_minor = 0;
optcd_disk->fops = &opt_fops;
sprintf(optcd_disk->disk_name, "optcd");
- sprintf(optcd_disk->devfs_name, "optcd");
if (!request_region(optcd_port, 4, "optcd")) {
printk(KERN_ERR "optcd: conflict, I/O port 0x%x already used\n",
if (!request_region(optcd_port, 4, "optcd")) {
printk(KERN_ERR "optcd: conflict, I/O port 0x%x already used\n",