From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753320Ab3LUBKq (ORCPT ); Fri, 20 Dec 2013 20:10:46 -0500 Received: from mga09.intel.com ([134.134.136.24]:11126 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522Ab3LUBKn (ORCPT ); Fri, 20 Dec 2013 20:10:43 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,524,1384329600"; d="scan'208";a="428104819" From: David Cohen To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org Cc: linux-kernel@vger.kernel.org, david.a.cohen@linux.intel.com Subject: [PATCH v2 1/3] x86: intel-mid: sfi_handle_*_dev() should check for pdata error code Date: Fri, 20 Dec 2013 17:15:11 -0800 Message-Id: <1387588513-25701-2-git-send-email-david.a.cohen@linux.intel.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1387588513-25701-1-git-send-email-david.a.cohen@linux.intel.com> References: <1387518179-4316-1-git-send-email-david.a.cohen@linux.intel.com> <1387588513-25701-1-git-send-email-david.a.cohen@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When Intel MID finds a match between SFI table from FW and registered SFI devices, it will execute platform initialization code, acquire platform data and register platform device to probe the driver. But if platform initialization code fails, Intel MID will still register platform device even though it's likely it won't work properly. This patch handles this error condition in more graceful way. Since 'NULL' is a valid return value, this patch makes sfi_handle_*_dev() functions to use IS_ERR() to validate returned pdata. Then, it prevents sfi_handle_*_dev() to register device in case intel_mid_sfi_get_pdata() failed to execute. Signed-off-by: David Cohen --- arch/x86/platform/intel-mid/sfi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/platform/intel-mid/sfi.c b/arch/x86/platform/intel-mid/sfi.c index 80a52288555c..1d5d20b088fa 100644 --- a/arch/x86/platform/intel-mid/sfi.c +++ b/arch/x86/platform/intel-mid/sfi.c @@ -337,6 +337,8 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry, pr_debug("IPC bus, name = %16.16s, irq = 0x%2x\n", pentry->name, pentry->irq); pdata = intel_mid_sfi_get_pdata(dev, pentry); + if (IS_ERR(pdata)) + return; pdev = platform_device_alloc(pentry->name, 0); if (pdev == NULL) { @@ -370,6 +372,8 @@ static void __init sfi_handle_spi_dev(struct sfi_device_table_entry *pentry, spi_info.chip_select); pdata = intel_mid_sfi_get_pdata(dev, &spi_info); + if (IS_ERR(pdata)) + return; spi_info.platform_data = pdata; if (dev->delay) @@ -395,6 +399,8 @@ static void __init sfi_handle_i2c_dev(struct sfi_device_table_entry *pentry, i2c_info.addr); pdata = intel_mid_sfi_get_pdata(dev, &i2c_info); i2c_info.platform_data = pdata; + if (IS_ERR(pdata)) + return; if (dev->delay) intel_scu_i2c_device_register(pentry->host_num, &i2c_info); -- 1.8.4.2