From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [patch 24/30] drivers/scsi/megaraid.c: kmalloc + memset conversion to kzalloc Date: Fri, 10 Aug 2007 14:50:49 -0700 Message-ID: <200708102150.l7ALonOX011390@imap1.linux-foundation.org> Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:34038 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752418AbXHJV7T (ORCPT ); Fri, 10 Aug 2007 17:59:19 -0400 Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James.Bottomley@steeleye.com Cc: linux-scsi@vger.kernel.org, akpm@linux-foundation.org, m.kozlowski@tuxland.pl From: Mariusz Kozlowski This patch does kmalloc + memset conversion to kzalloc and adds missing check for kzalloc return value. drivers/scsi/megaraid.c | 116109 -> 116094 (-15 bytes) drivers/scsi/megaraid.o | 257872 -> 257772 (-100 bytes) Signed-off-by: Mariusz Kozlowski Signed-off-by: Andrew Morton --- drivers/scsi/megaraid.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/scsi/megaraid.c~drivers-scsi-megaraidc-kmalloc-memset-conversion-to-kzalloc drivers/scsi/megaraid.c --- a/drivers/scsi/megaraid.c~drivers-scsi-megaraidc-kmalloc-memset-conversion-to-kzalloc +++ a/drivers/scsi/megaraid.c @@ -4408,8 +4408,10 @@ mega_internal_command(adapter_t *adapter scmd = &adapter->int_scmd; memset(scmd, 0, sizeof(Scsi_Cmnd)); - sdev = kmalloc(sizeof(struct scsi_device), GFP_KERNEL); - memset(sdev, 0, sizeof(struct scsi_device)); + sdev = kzalloc(sizeof(struct scsi_device), GFP_KERNEL); + if (!sdev) + return -ENOMEM; + scmd->device = sdev; scmd->device->host = adapter->host; _