git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
drivers
/
isdn
/
pcbit
/
drv.c
diff --git
a/drivers/isdn/pcbit/drv.c
b/drivers/isdn/pcbit/drv.c
index
1966f34
..
11c1b0b
100644
(file)
--- a/
drivers/isdn/pcbit/drv.c
+++ b/
drivers/isdn/pcbit/drv.c
@@
-73,14
+73,13
@@
int pcbit_init_dev(int board, int mem_base, int irq)
struct pcbit_dev *dev;
isdn_if *dev_if;
struct pcbit_dev *dev;
isdn_if *dev_if;
- if ((dev=k
m
alloc(sizeof(struct pcbit_dev), GFP_KERNEL)) == NULL)
+ if ((dev=k
z
alloc(sizeof(struct pcbit_dev), GFP_KERNEL)) == NULL)
{
printk("pcbit_init: couldn't malloc pcbit_dev struct\n");
return -ENOMEM;
}
dev_pcbit[board] = dev;
{
printk("pcbit_init: couldn't malloc pcbit_dev struct\n");
return -ENOMEM;
}
dev_pcbit[board] = dev;
- memset(dev, 0, sizeof(struct pcbit_dev));
init_waitqueue_head(&dev->set_running_wq);
spin_lock_init(&dev->lock);
init_waitqueue_head(&dev->set_running_wq);
spin_lock_init(&dev->lock);
@@
-104,7
+103,7
@@
int pcbit_init_dev(int board, int mem_base, int irq)
return -EACCES;
}
return -EACCES;
}
- dev->b1 = k
m
alloc(sizeof(struct pcbit_chan), GFP_KERNEL);
+ dev->b1 = k
z
alloc(sizeof(struct pcbit_chan), GFP_KERNEL);
if (!dev->b1) {
printk("pcbit_init: couldn't malloc pcbit_chan struct\n");
iounmap(dev->sh_mem);
if (!dev->b1) {
printk("pcbit_init: couldn't malloc pcbit_chan struct\n");
iounmap(dev->sh_mem);
@@
-113,7
+112,7
@@
int pcbit_init_dev(int board, int mem_base, int irq)
return -ENOMEM;
}
return -ENOMEM;
}
- dev->b2 = k
m
alloc(sizeof(struct pcbit_chan), GFP_KERNEL);
+ dev->b2 = k
z
alloc(sizeof(struct pcbit_chan), GFP_KERNEL);
if (!dev->b2) {
printk("pcbit_init: couldn't malloc pcbit_chan struct\n");
kfree(dev->b1);
if (!dev->b2) {
printk("pcbit_init: couldn't malloc pcbit_chan struct\n");
kfree(dev->b1);
@@
-123,8
+122,6
@@
int pcbit_init_dev(int board, int mem_base, int irq)
return -ENOMEM;
}
return -ENOMEM;
}
- memset(dev->b1, 0, sizeof(struct pcbit_chan));
- memset(dev->b2, 0, sizeof(struct pcbit_chan));
dev->b2->id = 1;
INIT_WORK(&dev->qdelivery, pcbit_deliver);
dev->b2->id = 1;
INIT_WORK(&dev->qdelivery, pcbit_deliver);