The patch titled drivers/media/video/msp3400-driver.c: kmalloc + memset conversion to kzalloc has been added to the -mm tree. Its filename is drivers-media-video-msp3400-driverc-kmalloc-memset-conversion-to-kzalloc.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: drivers/media/video/msp3400-driver.c: kmalloc + memset conversion to kzalloc From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx> drivers/media/video/msp3400-driver.c | 28945 -> 28898 (-47 bytes) drivers/media/video/msp3400-driver.o | 125620 -> 125320 (-300 bytes) Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/media/video/msp3400-driver.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff -puN drivers/media/video/msp3400-driver.c~drivers-media-video-msp3400-driverc-kmalloc-memset-conversion-to-kzalloc drivers/media/video/msp3400-driver.c --- a/drivers/media/video/msp3400-driver.c~drivers-media-video-msp3400-driverc-kmalloc-memset-conversion-to-kzalloc +++ a/drivers/media/video/msp3400-driver.c @@ -813,8 +813,9 @@ static int msp_attach(struct i2c_adapter int msp_rom; client = kzalloc(sizeof(*client), GFP_KERNEL); - if (client == NULL) + if (!client) return -ENOMEM; + client->addr = address; client->adapter = adapter; client->driver = &i2c_driver; @@ -826,14 +827,14 @@ static int msp_attach(struct i2c_adapter return 0; } - state = kmalloc(sizeof(*state), GFP_KERNEL); - if (state == NULL) { + state = kzalloc(sizeof(*state), GFP_KERNEL); + if (!state) { kfree(client); return -ENOMEM; } + i2c_set_clientdata(client, state); - memset(state, 0, sizeof(*state)); state->v4l2_std = V4L2_STD_NTSC; state->audmode = V4L2_TUNER_MODE_STEREO; state->volume = 58880; /* 0db gain */ _ Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are fs-9p-convc-error-path-fix.patch fs-cifs-connectc-kmalloc-memset-conversion-to-kzalloc.patch drivers-md-dm-hw-handlerc-kmalloc-memset-conversion-to-kzalloc.patch drivers-md-dm-path-selectorc-kmalloc-memset-conversion-to-kzalloc.patch drivers-md-dm-tablec-kmalloc-memset-conversion-to-kzalloc.patch drivers-md-dm-targetc-kmalloc-memset-conversion-to-kzalloc.patch drivers-media-video-msp3400-driverc-kmalloc-memset-conversion-to-kzalloc.patch drivers-input-serio-gscps2c-kmalloc-memset-conversion-to-kzalloc.patch drivers-ide-arm-icsidec-kmalloc-memset-conversion-to-kzalloc.patch drivers-mmc-core-busc-kmalloc-memset-conversion-to-kzalloc.patch drivers-mmc-core-hostc-kmalloc-memset-conversion-to-kzalloc.patch drivers-mmc-core-mmc_opsc-kmalloc-memset-conversion-to-kzalloc.patch mtd-add-module-license-to-mtdbdi.patch mtd-remove-redundant-dead-code-from-physmap_ofc.patch drivers-mtd-inftlmountc-kmalloc-memset-conversion-to-kcalloc.patch usb-remove-redundant-memset-from-amd5536udc.patch net-decnet-dn_routec-kmalloc-memset-conversion-to-kzalloc.patch drivers-net-wan-hdlc_frc-kmalloc-memset-conversion-to-kzalloc.patch net-ipv4-ip_optionsc-kmalloc-memset-conversion-to-kzalloc.patch drivers-net-irda-irda-usbc-mostly-kmalloc-memset-conversion-to-kalloc.patch drivers-atm-iphasec-mostly-kmalloc-memset-conversion-to-kzalloc.patch dont-optimise-away-baud-rate-changes-when-bother-is-used.patch drivers-pci-hotplug-cpqphp_ctrlc-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-a4000tc-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-bvme6000_scsic-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-gdthc-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-ide-scsic-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-lpfc-lpfc_debugfsc-kmalloc-memset-conversion-to-kcalloc.patch drivers-scsi-lpfc-lpfc_initc-kmalloc-memset-conversion-to-kcalloc.patch drivers-scsi-lpfc-lpfc_scsic-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-megaraidc-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-dpt_i2oc-kmalloc-memset-conversion-to-kzalloc.patch drivers-message-fusion-mptctlc-mostly-kmalloc-memset-conversion-to-kzalloc.patch drivers-block-ccissc-kmalloc-memset-conversion-to-kzalloc.patch drivers-block-cpqarrayc-better-error-handling-and-kmalloc-memset-conversion-to-kalloc.patch drivers-sbus-char-bbc_envctrlc-kmalloc-memset-conversion-to-kzalloc.patch drivers-sbus-char-bbc_i2cc-kmalloc-memset-conversion-to-kzalloc.patch drivers-usb-misc-ftdi-elanc-kmalloc-memset-conversion-to-kzalloc.patch arch-x86_64-kernel-io_apicc-kmalloc-memset-conversion-to-kzalloc.patch include-asm-frv-thread_infoh-kmalloc-memset-conversion-to-kzalloc.patch drivers-char-consolemapc-kmalloc-memset-conversion-to-kzalloc.patch doc-firmware_sample_firmware_classc-kmalloc-memset-conversion-to-kzalloc.patch fs-autofs4-inodec-kmalloc-memset-conversion-to-kzalloc.patch drivers-char-ip2-ip2mainc-kmalloc-memset-conversion-to-kzalloc.patch fs-jbd2-journalc-kmalloc-memset-conversion-to-kzalloc.patch fs-reiser4-plugin-file-cryptcompressc-kmalloc-memset-conversion-to-kzalloc.patch reiser4-kmalloc-memset-conversion-to-kzalloc.patch fs-reiser4-init_superc-kmalloc-memset-conversion-to-kzalloc.patch fs-reiser4-plugin-inode_ops_renamec-kmalloc-memset-conversion-to-kzalloc.patch fs-reiser4-ktxnmgrdc-kmalloc-memset-conversion-to-kzalloc.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html