diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
| commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
| tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /drivers/parisc/hppb.c | |
| parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
| parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) | |
| download | op-kernel-dev-3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb.zip op-kernel-dev-3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'drivers/parisc/hppb.c')
| -rw-r--r-- | drivers/parisc/hppb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c index 5edf93f..07dc2b6 100644 --- a/drivers/parisc/hppb.c +++ b/drivers/parisc/hppb.c @@ -60,12 +60,11 @@ static int hppb_probe(struct parisc_device *dev) } if(card->hpa) { - card->next = kmalloc(sizeof(struct hppb_card), GFP_KERNEL); + card->next = kzalloc(sizeof(struct hppb_card), GFP_KERNEL); if(!card->next) { printk(KERN_ERR "HP-PB: Unable to allocate memory.\n"); return 1; } - memset(card->next, '\0', sizeof(struct hppb_card)); card = card->next; } printk(KERN_INFO "Found GeckoBoa at 0x%lx\n", dev->hpa.start); |
