From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756495Ab2LLAgE (ORCPT ); Tue, 11 Dec 2012 19:36:04 -0500 Received: from mail-we0-f174.google.com ([74.125.82.174]:52691 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933166Ab2LLAcw (ORCPT ); Tue, 11 Dec 2012 19:32:52 -0500 From: Cyril Roelandt To: linux-kernel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, Cyril Roelandt , gregkh@linuxfoundation.org, eduardo.valentin@ti.com, rui.zhang@intel.com, durgadoss.r@intel.com, rjw@sisk.pl, devel@driverdev.osuosl.org Subject: [PATCH 1/5] staging: omap-thermal: fix error check in omap_thermal_expose_sensor() and in omap_thermal_register_cpu_cooling(). Date: Wed, 12 Dec 2012 01:24:50 +0100 Message-Id: <1355271894-5284-2-git-send-email-tipecaml@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355271894-5284-1-git-send-email-tipecaml@gmail.com> References: <1355271894-5284-1-git-send-email-tipecaml@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The omap_bandgap_get_sensor_data() function returns ERR_PTR(), so we need to use IS_ERR() rather than a NULL check. Signed-off-by: Cyril Roelandt --- drivers/staging/omap-thermal/omap-thermal-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/omap-thermal/omap-thermal-common.c b/drivers/staging/omap-thermal/omap-thermal-common.c index 61f1070..79a55aa 100644 --- a/drivers/staging/omap-thermal/omap-thermal-common.c +++ b/drivers/staging/omap-thermal/omap-thermal-common.c @@ -260,7 +260,7 @@ int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, data = omap_bandgap_get_sensor_data(bg_ptr, id); - if (!data) + if (IS_ERR(data)) data = omap_thermal_build_data(bg_ptr, id); if (!data) @@ -309,7 +309,7 @@ int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id) struct omap_thermal_data *data; data = omap_bandgap_get_sensor_data(bg_ptr, id); - if (!data) + if (IS_ERR(data)) data = omap_thermal_build_data(bg_ptr, id); if (!data) -- 1.7.10.4