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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
isdn
/
hardware
/
eicon
/
divasmain.c
diff --git
a/drivers/isdn/hardware/eicon/divasmain.c
b/drivers/isdn/hardware/eicon/divasmain.c
index
f00f6ba
..
866ae64
100644
(file)
--- a/
drivers/isdn/hardware/eicon/divasmain.c
+++ b/
drivers/isdn/hardware/eicon/divasmain.c
@@
-556,7
+556,7
@@
void diva_os_remove_soft_isr(diva_os_soft_isr_t * psoft_isr)
tasklet_kill(&pdpc->divas_task);
flush_scheduled_work();
mem = psoft_isr->object;
tasklet_kill(&pdpc->divas_task);
flush_scheduled_work();
mem = psoft_isr->object;
- psoft_isr->object =
0
;
+ psoft_isr->object =
NULL
;
diva_os_free(0, mem);
}
}
diva_os_free(0, mem);
}
}
@@
-565,7
+565,7
@@
void diva_os_remove_soft_isr(diva_os_soft_isr_t * psoft_isr)
* kernel/user space copy functions
*/
static int
* kernel/user space copy functions
*/
static int
-xdi_copy_to_user(void *os_handle, void *dst, const void *src, int length)
+xdi_copy_to_user(void *os_handle, void
__user
*dst, const void *src, int length)
{
if (copy_to_user(dst, src, length)) {
return (-EFAULT);
{
if (copy_to_user(dst, src, length)) {
return (-EFAULT);
@@
-574,7
+574,7
@@
xdi_copy_to_user(void *os_handle, void *dst, const void *src, int length)
}
static int
}
static int
-xdi_copy_from_user(void *os_handle, void *dst, const void *src, int length)
+xdi_copy_from_user(void *os_handle, void *dst, const void
__user
*src, int length)
{
if (copy_from_user(dst, src, length)) {
return (-EFAULT);
{
if (copy_from_user(dst, src, length)) {
return (-EFAULT);
@@
-598,7
+598,7
@@
static int divas_release(struct inode *inode, struct file *file)
return (0);
}
return (0);
}
-static ssize_t divas_write(struct file *file, const char *buf,
+static ssize_t divas_write(struct file *file, const char
__user
*buf,
size_t count, loff_t * ppos)
{
int ret = -EINVAL;
size_t count, loff_t * ppos)
{
int ret = -EINVAL;
@@
-629,7
+629,7
@@
static ssize_t divas_write(struct file *file, const char *buf,
return (ret);
}
return (ret);
}
-static ssize_t divas_read(struct file *file, char *buf,
+static ssize_t divas_read(struct file *file, char
__user
*buf,
size_t count, loff_t * ppos)
{
int ret = -EINVAL;
size_t count, loff_t * ppos)
{
int ret = -EINVAL;
@@
-703,7
+703,7
@@
static int DIVA_INIT_FUNCTION divas_register_chrdev(void)
static int __devinit divas_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
static int __devinit divas_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
- void *pdiva =
0
;
+ void *pdiva =
NULL
;
u8 pci_latency;
u8 new_latency = 32;
u8 pci_latency;
u8 new_latency = 32;