[PATCH] serial: replace kmalloc+memset with kzalloc
Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
3689a0ec60
commit
8f31bb39ec
@@ -194,31 +194,28 @@ static int jsm_tty_open(struct uart_port *port)
|
||||
/* Drop locks, as malloc with GFP_KERNEL can sleep */
|
||||
|
||||
if (!channel->ch_rqueue) {
|
||||
channel->ch_rqueue = (u8 *) kmalloc(RQUEUESIZE, GFP_KERNEL);
|
||||
channel->ch_rqueue = kzalloc(RQUEUESIZE, GFP_KERNEL);
|
||||
if (!channel->ch_rqueue) {
|
||||
jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
|
||||
"unable to allocate read queue buf");
|
||||
return -ENOMEM;
|
||||
}
|
||||
memset(channel->ch_rqueue, 0, RQUEUESIZE);
|
||||
}
|
||||
if (!channel->ch_equeue) {
|
||||
channel->ch_equeue = (u8 *) kmalloc(EQUEUESIZE, GFP_KERNEL);
|
||||
channel->ch_equeue = kzalloc(EQUEUESIZE, GFP_KERNEL);
|
||||
if (!channel->ch_equeue) {
|
||||
jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
|
||||
"unable to allocate error queue buf");
|
||||
return -ENOMEM;
|
||||
}
|
||||
memset(channel->ch_equeue, 0, EQUEUESIZE);
|
||||
}
|
||||
if (!channel->ch_wqueue) {
|
||||
channel->ch_wqueue = (u8 *) kmalloc(WQUEUESIZE, GFP_KERNEL);
|
||||
channel->ch_wqueue = kzalloc(WQUEUESIZE, GFP_KERNEL);
|
||||
if (!channel->ch_wqueue) {
|
||||
jsm_printk(INIT, ERR, &channel->ch_bd->pci_dev,
|
||||
"unable to allocate write queue buf");
|
||||
return -ENOMEM;
|
||||
}
|
||||
memset(channel->ch_wqueue, 0, WQUEUESIZE);
|
||||
}
|
||||
|
||||
channel->ch_flags &= ~(CH_OPENING);
|
||||
@@ -392,13 +389,12 @@ int jsm_tty_init(struct jsm_board *brd)
|
||||
* Okay to malloc with GFP_KERNEL, we are not at
|
||||
* interrupt context, and there are no locks held.
|
||||
*/
|
||||
brd->channels[i] = kmalloc(sizeof(struct jsm_channel), GFP_KERNEL);
|
||||
brd->channels[i] = kzalloc(sizeof(struct jsm_channel), GFP_KERNEL);
|
||||
if (!brd->channels[i]) {
|
||||
jsm_printk(CORE, ERR, &brd->pci_dev,
|
||||
"%s:%d Unable to allocate memory for channel struct\n",
|
||||
__FILE__, __LINE__);
|
||||
}
|
||||
memset(brd->channels[i], 0, sizeof(struct jsm_channel));
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user