From patchwork Mon Jun 22 04:01:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 6653061 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8AFCFC05AC for ; Mon, 22 Jun 2015 04:01:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA0C120551 for ; Mon, 22 Jun 2015 04:01:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D33A62054A for ; Mon, 22 Jun 2015 04:01:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750709AbbFVEBn (ORCPT ); Mon, 22 Jun 2015 00:01:43 -0400 Received: from mail-qc0-f173.google.com ([209.85.216.173]:35930 "EHLO mail-qc0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750712AbbFVEBn (ORCPT ); Mon, 22 Jun 2015 00:01:43 -0400 Received: by qcet6 with SMTP id t6so22820738qce.3 for ; Sun, 21 Jun 2015 21:01:42 -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; bh=bgutPcclcOu9oL+9uEtdZxFVDFvaZ+o/8vn/Rd4f8+Y=; b=qfkLv+4qvNepfvlnjgdAzXplAbJb6HzEPCJMIFieRhJSm63JOZ2IOmm0mTUqOsuU1e 4/tpUX/9NCYcVdWI29I6uG4OUKKTgSr6kgpQrC2heSCUmLT5jj6M8MdWGiZdiBnJtJXP FHMYqC37hLduGlfoPMVR+vYnhrndoPRpNaF4mL7zjU2kL+wdg11dxaP6AHob2Z7jTe7f ZL8foMxBkZk6TxaAU24IanF8jmv/Er7g7GUNwsWyIcJau+tfq42rSPydNGT9+IGyC3p6 qmCjEpiV3fkUzdv0K3fd+mpDYwi6598dyQRxiJZmNlBGPvQ6Pok/cKDAj56f8gDt2Oxi PB7Q== X-Received: by 10.55.31.164 with SMTP id n36mr57911458qkh.76.1434945702300; Sun, 21 Jun 2015 21:01:42 -0700 (PDT) Received: from localhost.localdomain ([189.101.187.123]) by mx.google.com with ESMTPSA id j66sm9842501qgj.8.2015.06.21.21.01.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 21 Jun 2015 21:01:41 -0700 (PDT) From: Fabio Estevam To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, Fabio Estevam Subject: [PATCH] Input: imx_keypad - check for clk_prepare_enable() error Date: Mon, 22 Jun 2015 01:01:18 -0300 Message-Id: <1434945678-8027-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-8.2 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 we should better 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 2e855e6..d2ea863 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -506,7 +506,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);