Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752580AbbFXL0w (ORCPT ); Wed, 24 Jun 2015 07:26:52 -0400 Received: from cpanel09.rubas.ch ([195.182.222.79]:42705 "EHLO cpanel09.tophost.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752498AbbFXL0e (ORCPT ); Wed, 24 Jun 2015 07:26:34 -0400 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= To: Greg Kroah-Hartman Cc: Gigi Joseph , Colin Ian King , linux-kernel@vger.kernel.org, =?UTF-8?q?J=C3=BCrg=20Billeter?= Subject: [PATCH 1/3] ti-st: st_kim: use ERR_PTR(-ENOMEM) instead of NULL Date: Wed, 24 Jun 2015 12:24:04 +0200 Message-Id: <1435141446-27236-1-git-send-email-j@bitron.ch> X-Mailer: git-send-email 2.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel09.tophost.ch X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - bitron.ch X-Get-Message-Sender-Via: cpanel09.tophost.ch: authenticated_id: juerg@bitron.ch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1389 Lines: 49 This allows return of other error codes. Signed-off-by: Jürg Billeter --- drivers/misc/ti-st/st_kim.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index 5027b8f..af71584 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c @@ -752,8 +752,11 @@ static struct ti_st_plat_data *get_platform_data(struct device *dev) int len; dt_pdata = kzalloc(sizeof(*dt_pdata), GFP_KERNEL); - if (!dt_pdata) - return NULL; + + if (!dt_pdata) { + pr_err("Can't allocate device_tree platform data\n"); + return ERR_PTR(-ENOMEM); + } dt_property = of_get_property(np, "dev_name", &len); if (dt_property) @@ -773,10 +776,13 @@ static int kim_probe(struct platform_device *pdev) struct ti_st_plat_data *pdata; int err; - if (pdev->dev.of_node) + if (pdev->dev.of_node) { pdata = get_platform_data(&pdev->dev); - else + if (IS_ERR(pdata)) + return PTR_ERR(pdata); + } else { pdata = pdev->dev.platform_data; + } if (pdata == NULL) { dev_err(&pdev->dev, "Platform Data is missing\n"); -- 2.4.3 -- 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/