From patchwork Thu Jul 11 04:44:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 2825986 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 90A46C0AB2 for ; Thu, 11 Jul 2013 04:50:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADBDC200EA for ; Thu, 11 Jul 2013 04:50:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 079EC200E3 for ; Thu, 11 Jul 2013 04:50:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750803Ab3GKEuZ (ORCPT ); Thu, 11 Jul 2013 00:50:25 -0400 Received: from mail-yh0-f50.google.com ([209.85.213.50]:64486 "EHLO mail-yh0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750801Ab3GKEuZ (ORCPT ); Thu, 11 Jul 2013 00:50:25 -0400 Received: by mail-yh0-f50.google.com with SMTP id i72so3083961yha.37 for ; Wed, 10 Jul 2013 21:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=FR9dR4T6x54pC/R8+RvAjmsU1WANXRIFD0S/pw1+aiU=; b=H3Cx4uUNVT0l+L0VVGDiayf0wB4DtON0GlitHbV1er8CFCLznaBrnH6i2tXPSbsks8 O50RwnnnsvkWEzY+ysvlCnK6IZN3wyfcquSZtHIKaMO70Ia2N7f2291RBsslsINGaaLM a2Nz+M0CjnxzXpu4VM0RyZe7eCGa1m/RbsRqd+l//GfL0ER1VmEwPrAswk6DYZotQkQu mskGetaVUTnvTgyDiXuF0WOArlFNU2LHXTa34wv7C4zZIR6nQX49tlNncXvh7FLWA6Zo TRyIu63ehA5DEELwstVqpf0Ob81O2YXoeLtJ8OF0YuBWE02DtILQsszqZTNV9+jEuIsW XOBQ== X-Received: by 10.236.229.232 with SMTP id h98mr19985641yhq.177.1373517900079; Wed, 10 Jul 2013 21:45:00 -0700 (PDT) Received: from localhost.localdomain ([187.106.36.171]) by mx.google.com with ESMTPSA id h26sm57832607yhb.21.2013.07.10.21.44.58 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Jul 2013 21:44:59 -0700 (PDT) From: Fabio Estevam To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, Fabio Estevam Subject: [PATCH 1/2] Input: imx_keypad - check the return value from clk_prepare_enable() Date: Thu, 11 Jul 2013 01:44:47 -0300 Message-Id: <1373517888-15615-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam clk_prepare_enable() may fail, so let's check its return value and propagate it in the case of error. Signed-off-by: Fabio Estevam --- drivers/input/keyboard/imx_keypad.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index 03c8cc5..99d3360 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -512,7 +512,9 @@ static int imx_keypad_probe(struct platform_device *pdev) input_set_drvdata(input_dev, keypad); /* Ensure that the keypad will stay dormant until opened */ - clk_prepare_enable(keypad->clk); + error = clk_prepare_enable(keypad->clk); + if (error) + return error; imx_keypad_inhibit(keypad); clk_disable_unprepare(keypad->clk);