Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751491AbaLPAOf (ORCPT ); Mon, 15 Dec 2014 19:14:35 -0500 Received: from mga09.intel.com ([134.134.136.24]:8137 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750818AbaLPAOe (ORCPT ); Mon, 15 Dec 2014 19:14:34 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,582,1413270000"; d="scan'208";a="624268070" From: Kevin Strasser To: alsa-devel@alsa-project.org Cc: Liam Girdwood , Vinod Koul , Mark Brown , Mengdong Lin , Yang Fang , linux-kernel@vger.kernel.org, Kevin Strasser Subject: [PATCH v2] ASoC: Intel: fix possible acpi enumeration panic Date: Mon, 15 Dec 2014 16:15:04 -0800 Message-Id: <1418688904-26959-1-git-send-email-kevin.strasser@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418282517-851-1-git-send-email-kevin.strasser@intel.com> References: <1418282517-851-1-git-send-email-kevin.strasser@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A crash can occur on some platforms where adsp is enumerated but codec is not matched. Define codec_id as a pointer intead of an array so that it gets initialized to NULL for the terminating element of sst_acpi_bytcr[] and sst_acpi_chv[]. Signed-off-by: Kevin Strasser --- sound/soc/intel/sst/sst_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c index 31124aa..87b5090 100644 --- a/sound/soc/intel/sst/sst_acpi.c +++ b/sound/soc/intel/sst/sst_acpi.c @@ -43,7 +43,7 @@ #include "sst.h" struct sst_machines { - char codec_id[32]; + char *codec_id; char board[32]; char machine[32]; void (*machine_quirk)(void); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/