From patchwork Wed Oct 21 12:52:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ladislav.Michl@seznam.cz X-Patchwork-Id: 55067 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9LAqIKT001361 for ; Wed, 21 Oct 2009 10:52:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753285AbZJUKwM (ORCPT ); Wed, 21 Oct 2009 06:52:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753278AbZJUKwM (ORCPT ); Wed, 21 Oct 2009 06:52:12 -0400 Received: from smtp.seznam.cz ([77.75.72.43]:33458 "EHLO smtp.seznam.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753163AbZJUKwM (ORCPT ); Wed, 21 Oct 2009 06:52:12 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=seznam.cz; h=Received:Received:Date:From:To:Subject:Message-ID:Reply-To:MIME-Version:Content-Type:Content-Disposition:User-Agent:X-Smtpd:X-Seznam-User:X-QM-Mark; b=e2zDtJM0QNhDmWpHPfpRHIclu+tBMk6C7ivvXIIgCMKfVMBusikKrBRq6O8Ot1p4H SSC3Y7hRV1z7xO1SZJB90XF5+Vbfgqfs6kGp26nzSq8Aqt0AGr1N+mYsbejimFHYjfu DoThITijVqfhML5JWfgbhbpdmEvRm6hxVXgl0jo= Received: from debian (34.24.broadband3.iol.cz [85.70.24.34]) by email-relay2.go.seznam.cz (Seznam SMTPD 1.1.7@13984) with ESMTP; Wed, 21 Oct 2009 12:52:14 +0200 (CEST) Received: by debian (sSMTP sendmail emulation); Wed, 21 Oct 2009 14:52:17 +0200 Date: Wed, 21 Oct 2009 14:52:17 +0200 From: Ladislav.Michl@seznam.cz To: linux-omap@vger.kernel.org Subject: [PATCH] mmci-omap: remove bogus check for host->iclk Message-ID: <20091021125217.GB8525@localhost.localdomain> Reply-To: Ladislav Michl MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Smtpd: 1.1.7@13984 X-Seznam-User: ladislav.michl@seznam.cz X-QM-Mark: email-qm4<400121892> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 5d773b8..c6d7e8e 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -1459,8 +1459,10 @@ static int __init mmc_omap_probe(struct platform_device *pdev) goto err_ioremap; host->iclk = clk_get(&pdev->dev, "ick"); - if (IS_ERR(host->iclk)) + if (IS_ERR(host->iclk)) { + ret = PTR_ERR(host->iclk); goto err_free_mmc_host; + } clk_enable(host->iclk); host->fclk = clk_get(&pdev->dev, "fck"); @@ -1500,10 +1502,8 @@ err_free_irq: err_free_fclk: clk_put(host->fclk); err_free_iclk: - if (host->iclk != NULL) { - clk_disable(host->iclk); - clk_put(host->iclk); - } + clk_disable(host->iclk); + clk_put(host->iclk); err_free_mmc_host: iounmap(host->virt_base); err_ioremap: