projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
drivers
/
atm
/
iphase.c
diff --git
a/drivers/atm/iphase.c
b/drivers/atm/iphase.c
index
a3b605a
..
ef52452
100644
(file)
--- a/
drivers/atm/iphase.c
+++ b/
drivers/atm/iphase.c
@@
-1601,14
+1601,14
@@
static int rx_init(struct atm_dev *dev)
skb_queue_head_init(&iadev->rx_dma_q);
iadev->rx_free_desc_qhead = NULL;
skb_queue_head_init(&iadev->rx_dma_q);
iadev->rx_free_desc_qhead = NULL;
- iadev->rx_open = kmalloc(4*iadev->num_vc,GFP_KERNEL);
- i
f (!iadev->rx_open)
- {
+
+ i
adev->rx_open = kzalloc(4 * iadev->num_vc, GFP_KERNEL);
+ if (!iadev->rx_open) {
printk(KERN_ERR DEV_LABEL "itf %d couldn't get free page\n",
dev->number);
goto err_free_dle;
}
printk(KERN_ERR DEV_LABEL "itf %d couldn't get free page\n",
dev->number);
goto err_free_dle;
}
- memset(iadev->rx_open, 0, 4*iadev->num_vc);
+
iadev->rxing = 1;
iadev->rx_pkt_cnt = 0;
/* Mode Register */
iadev->rxing = 1;
iadev->rx_pkt_cnt = 0;
/* Mode Register */
@@
-3171,12
+3171,12
@@
static int __devinit ia_init_one(struct pci_dev *pdev,
unsigned long flags;
int ret;
unsigned long flags;
int ret;
- iadev = k
malloc(sizeof(*iadev), GFP_KERNEL);
+ iadev = k
zalloc(sizeof(*iadev), GFP_KERNEL);
if (!iadev) {
ret = -ENOMEM;
goto err_out;
}
if (!iadev) {
ret = -ENOMEM;
goto err_out;
}
- memset(iadev, 0, sizeof(*iadev));
+
iadev->pci = pdev;
IF_INIT(printk("ia detected at bus:%d dev: %d function:%d\n",
iadev->pci = pdev;
IF_INIT(printk("ia detected at bus:%d dev: %d function:%d\n",