From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754366AbbGQBq3 (ORCPT ); Thu, 16 Jul 2015 21:46:29 -0400 Received: from m12-17.163.com ([220.181.12.17]:43743 "EHLO m12-17.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752052AbbGQBq2 (ORCPT ); Thu, 16 Jul 2015 21:46:28 -0400 From: Heloise NH To: perex@perex.cz, tiwai@suse.de, david.henningsson@canonical.com, pshou@realtek.com, hui.wang@canonical.com Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, kernelpatch_update Subject: [PATCH] ALSA: hda: fix kstrdup return value Date: Fri, 17 Jul 2015 09:42:06 +0800 Message-Id: <1437097326-470-1-git-send-email-kernelpatch_update@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: EcCowAAHW1hyXahVKLwlAA--.6465S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrurWfZr1UXF1UAFW3Zw15XFb_yoW3twc_Xw 48KrWkWa1qqFn7Can5KrnYy3WSg34rCry0grnrtF4UAFs5tr48Wr98Ja15uFZrXFn2kry3 ur1DA3yq9r43AjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUboGQPUUUUU== X-Originating-IP: [124.16.141.104] X-CM-SenderInfo: xnhu0vxosd3uhkbx1vxdwhqiywtou0bp/xtbBLRc6glO-vCIfmwAAs0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: kernelpatch_update In kstrdup we should return -ENOMEM when it reports an memory allocation failure, while the -ENODEV is referred to a failure in finding the cpu node in the device tree. Signed-off-by: Heloise NH --- sound/pci/hda/hda_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 5de3c5d..d78fa71 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -975,7 +975,7 @@ int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card, if (codec->bus->modelname) { codec->modelname = kstrdup(codec->bus->modelname, GFP_KERNEL); if (!codec->modelname) { - err = -ENODEV; + err = -ENOMEM; goto error; } } -- 1.9.1