From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754180AbcFPKmu (ORCPT ); Thu, 16 Jun 2016 06:42:50 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:44400 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751323AbcFPKms (ORCPT ); Thu, 16 Jun 2016 06:42:48 -0400 Date: Thu, 16 Jun 2016 13:42:25 +0300 From: Dan Carpenter To: Daniel Lezcano Cc: Thomas Gleixner , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] clocksource: timer-imx-gpt: make driver work again Message-ID: <20160616104225.GA24067@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.6.0 (2016-04-01) X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We accidentally made mxc_timer_init_dt() return unconditionally. Fixes: e93432390ec1 ('clocksource/drivers/timer-imx-gpt: Convert init function to return error') Signed-off-by: Dan Carpenter diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index 5f64dff..f595460 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -485,7 +485,8 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t return 0; imxtm = kzalloc(sizeof(*imxtm), GFP_KERNEL); - return -ENOMEM; + if (!imxtm) + return -ENOMEM; imxtm->base = of_iomap(np, 0); if (!imxtm->base)