diff options
author | Panagiotis Issaris <takis@issaris.org> | 2006-01-11 16:40:56 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-11 16:40:56 -0500 |
commit | 7408187d223f63d46a13b6a35b8f96b032c2f623 (patch) | |
tree | 425a459f760295de488f57e3f97b034aaa76a78d /drivers/media/dvb/ttusb-dec/ttusb_dec.c | |
parent | 0b3af1b6df82cfdb54ae294ed860263011fa0408 (diff) |
V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc
Conversions from kmalloc+memset to k(z|c)alloc.
Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/ttusb-dec/ttusb_dec.c')
-rw-r--r-- | drivers/media/dvb/ttusb-dec/ttusb_dec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c index d8966d1d25ee..df831171e03c 100644 --- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c | |||
@@ -1606,15 +1606,13 @@ static int ttusb_dec_probe(struct usb_interface *intf, | |||
1606 | 1606 | ||
1607 | udev = interface_to_usbdev(intf); | 1607 | udev = interface_to_usbdev(intf); |
1608 | 1608 | ||
1609 | if (!(dec = kmalloc(sizeof(struct ttusb_dec), GFP_KERNEL))) { | 1609 | if (!(dec = kzalloc(sizeof(struct ttusb_dec), GFP_KERNEL))) { |
1610 | printk("%s: couldn't allocate memory.\n", __FUNCTION__); | 1610 | printk("%s: couldn't allocate memory.\n", __FUNCTION__); |
1611 | return -ENOMEM; | 1611 | return -ENOMEM; |
1612 | } | 1612 | } |
1613 | 1613 | ||
1614 | usb_set_intfdata(intf, (void *)dec); | 1614 | usb_set_intfdata(intf, (void *)dec); |
1615 | 1615 | ||
1616 | memset(dec, 0, sizeof(struct ttusb_dec)); | ||
1617 | |||
1618 | switch (le16_to_cpu(id->idProduct)) { | 1616 | switch (le16_to_cpu(id->idProduct)) { |
1619 | case 0x1006: | 1617 | case 0x1006: |
1620 | ttusb_dec_set_model(dec, TTUSB_DEC3000S); | 1618 | ttusb_dec_set_model(dec, TTUSB_DEC3000S); |