From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB8ECC2D0DB for ; Tue, 28 Jan 2020 14:25:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E73324688 for ; Tue, 28 Jan 2020 14:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221527; bh=TWHetQeApuPwWwnFAnNwR4s/mLNZZaOaZdJP3JYknWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FeBlmzAOuhcWPqnsRCnWkeKjwveYcIQBg1cYR6+LmSExBpJccbexERawzxXi9EbEs JjfFeHgL38ad44E/P8XqNFN2IbzJ5u0INCGf1ueQNe6RowWi82/DO7rTJU+XJTuXHm kYo+YtQTkVYbCHhLT7HupQ89g15277SK80KxsSqE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731157AbgA1OZ0 (ORCPT ); Tue, 28 Jan 2020 09:25:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:52262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730319AbgA1OZU (ORCPT ); Tue, 28 Jan 2020 09:25:20 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B942B2071E; Tue, 28 Jan 2020 14:25:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221520; bh=TWHetQeApuPwWwnFAnNwR4s/mLNZZaOaZdJP3JYknWg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tD0dLBHLukXBfJHm20haALZgHf3jJ1nxpBK55Ok9RgcCjDlcYxrYAY2ijMJiYaz1/ RtmA6ivv7k+T9053J0aU7TgeXgfZuYHnVyXbPjrj5fBtJsySZG2NQ708yu47u0Bh6y J6hhi+2wSSoQD4U0B9wKkwFYeJDIZigPW6n7UxC4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuhong Yuan , Dmitry Torokhov Subject: [PATCH 4.9 256/271] Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register Date: Tue, 28 Jan 2020 15:06:45 +0100 Message-Id: <20200128135911.651962121@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chuhong Yuan commit 97e24b095348a15ec08c476423c3b3b939186ad7 upstream. The driver misses a check for devm_thermal_zone_of_sensor_register(). Add a check to fix it. Fixes: e28d0c9cd381 ("input: convert sun4i-ts to use devm_thermal_zone_of_sensor_register") Signed-off-by: Chuhong Yuan Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/touchscreen/sun4i-ts.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/input/touchscreen/sun4i-ts.c +++ b/drivers/input/touchscreen/sun4i-ts.c @@ -246,6 +246,7 @@ static int sun4i_ts_probe(struct platfor struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; struct device *hwmon; + struct thermal_zone_device *thermal; int error; u32 reg; bool ts_attached; @@ -365,7 +366,10 @@ static int sun4i_ts_probe(struct platfor if (IS_ERR(hwmon)) return PTR_ERR(hwmon); - devm_thermal_zone_of_sensor_register(ts->dev, 0, ts, &sun4i_ts_tz_ops); + thermal = devm_thermal_zone_of_sensor_register(ts->dev, 0, ts, + &sun4i_ts_tz_ops); + if (IS_ERR(thermal)) + return PTR_ERR(thermal); writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);