diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-30 22:46:49 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-30 22:46:49 -0600 |
| commit | 4a70d7bbda936a5e93a2d6f6061800327491cc69 (patch) | |
| tree | e7734e7cfedf5a03d71471826f116e45df37272d /linux/drivers/media/video/hexium_orion.c | |
| parent | 012c447c3dd586921468215450cb6cce65052a3c (diff) | |
| parent | b03dad0db6b312169fd2e16c18187703b23ecd38 (diff) | |
| download | mediapointer-dvb-s2-4a70d7bbda936a5e93a2d6f6061800327491cc69.tar.gz mediapointer-dvb-s2-4a70d7bbda936a5e93a2d6f6061800327491cc69.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/hexium_orion.c')
| -rw-r--r-- | linux/drivers/media/video/hexium_orion.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/hexium_orion.c b/linux/drivers/media/video/hexium_orion.c index 776eeea1b..59ed0dfd2 100644 --- a/linux/drivers/media/video/hexium_orion.c +++ b/linux/drivers/media/video/hexium_orion.c @@ -225,12 +225,11 @@ static int hexium_probe(struct saa7146_dev *dev) return -EFAULT; } - hexium = (struct hexium *) kmalloc(sizeof(struct hexium), GFP_KERNEL); + hexium = kzalloc(sizeof(struct hexium), GFP_KERNEL); if (NULL == hexium) { printk("hexium_orion: hexium_probe: not enough kernel memory.\n"); return -ENOMEM; } - memset(hexium, 0x0, sizeof(struct hexium)); /* enable i2c-port pins */ saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); @@ -486,7 +485,7 @@ static struct saa7146_ext_vv vv_data = { }; static struct saa7146_extension extension = { - .name = "hexium HV-PCI6/Orion", + .name = "hexium HV-PCI6 Orion", .flags = 0, // SAA7146_USE_I2C_IRQ, .pci_tbl = &pci_tbl[0], |