From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752399Ab0IEDKQ (ORCPT ); Sat, 4 Sep 2010 23:10:16 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:58465 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750841Ab0IEDKN (ORCPT ); Sat, 4 Sep 2010 23:10:13 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=inBSuUfgjHt1zUkTO6SJAOVT0WInXFF9D+wcpDMbEB8x98asEJd7lgp/HTOM10t69w rSGAUjOXrpU0M71dMWooTQvJPgedsZxJjHDj/vCoRzOa5WXUvRkOPQVyLjdBtySElcrB tFfoxAmiPuRNgRRXUXJF6tfgKfWNBTGl3MFXA= Subject: [PATCH 2/2 v2] Input: stmpe-ts - return -ENOMEM if memory allocation fail From: Axel Lin To: linux-kernel Cc: Dmitry Torokhov , Wolfram Sang , Luotao Fu , linux-input@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Date: Sun, 05 Sep 2010 11:10:44 +0800 Message-ID: <1283656244.8339.3.camel@phoenix> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Axel Lin --- Change since v1: remove unneeded initialization of 'ret' variable drivers/input/touchscreen/stmpe-ts.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c index 656148e..06869e4 100644 --- a/drivers/input/touchscreen/stmpe-ts.c +++ b/drivers/input/touchscreen/stmpe-ts.c @@ -268,7 +268,7 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev) struct stmpe_touch *ts; struct input_dev *idev; struct stmpe_ts_platform_data *ts_pdata = NULL; - int ret = 0; + int ret; int ts_irq; ts_irq = platform_get_irq_byname(pdev, "FIFO_TH"); @@ -276,12 +276,16 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev) return ts_irq; ts = kzalloc(sizeof(*ts), GFP_KERNEL); - if (!ts) + if (!ts) { + ret = -ENOMEM; goto err_out; + } idev = input_allocate_device(); - if (!idev) + if (!idev) { + ret = -ENOMEM; goto err_free_ts; + } platform_set_drvdata(pdev, ts); ts->stmpe = stmpe; -- 1.7.0.4