diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-02-27 15:29:43 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-20 17:49:59 -0500 |
commit | 80b6ca48321974a6566a1c9048ba34f60420bca6 (patch) | |
tree | a350e3cf6b794081c13c89d5b1913b2c1207570d /drivers/usb/serial/io_edgeport.c | |
parent | d54a5cb6484705f7808b337917cc7598f2f971c3 (diff) |
[PATCH] USB: kzalloc() conversion for rest of drivers/usb
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/io_edgeport.c')
-rw-r--r-- | drivers/usb/serial/io_edgeport.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 3f29e6b0fd19..b606c5968102 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -2725,12 +2725,11 @@ static int edge_startup (struct usb_serial *serial) | |||
2725 | dev = serial->dev; | 2725 | dev = serial->dev; |
2726 | 2726 | ||
2727 | /* create our private serial structure */ | 2727 | /* create our private serial structure */ |
2728 | edge_serial = kmalloc (sizeof(struct edgeport_serial), GFP_KERNEL); | 2728 | edge_serial = kzalloc(sizeof(struct edgeport_serial), GFP_KERNEL); |
2729 | if (edge_serial == NULL) { | 2729 | if (edge_serial == NULL) { |
2730 | dev_err(&serial->dev->dev, "%s - Out of memory\n", __FUNCTION__); | 2730 | dev_err(&serial->dev->dev, "%s - Out of memory\n", __FUNCTION__); |
2731 | return -ENOMEM; | 2731 | return -ENOMEM; |
2732 | } | 2732 | } |
2733 | memset (edge_serial, 0, sizeof(struct edgeport_serial)); | ||
2734 | spin_lock_init(&edge_serial->es_lock); | 2733 | spin_lock_init(&edge_serial->es_lock); |
2735 | edge_serial->serial = serial; | 2734 | edge_serial->serial = serial; |
2736 | usb_set_serial_data(serial, edge_serial); | 2735 | usb_set_serial_data(serial, edge_serial); |