From patchwork Sun May 2 17:53:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 96374 X-Patchwork-Delegate: hiroshi.doyu@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o42HrVhf029899 for ; Sun, 2 May 2010 17:53:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758376Ab0EBRxa (ORCPT ); Sun, 2 May 2010 13:53:30 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:54051 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758355Ab0EBRx3 convert rfc822-to-8bit (ORCPT ); Sun, 2 May 2010 13:53:29 -0400 Received: by bwz19 with SMTP id 19so936553bwz.21 for ; Sun, 02 May 2010 10:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=sz9bcdZsjrs2AmL2Hh0qIeEX5St8BpIPiQUt5G6RFZ8=; b=LjeEBMwyP+SfyXW+reBGo4c7140x2Nh4lPc+6U3lGEfncv+mQPF/oK+UYoXHhBkGMe 9+unJZlTLP5cK6OsKTQwPIiGQLLOnOLPcte5EKbs+20vL1q/cZA6BbItMpx1vcsTd0ZZ 2ivSfwcCfS8GzTCD3H+t64XnoVRGPhIAsikys= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=Of8XvLVCYEn5jHFuW8E9qb4XFW+izWxcpadwnEykcnrK6RPuF/Qx9UsPeN0Gg+rDSB B5zaCaFUbEwAcKquw3GBNrqT5Nm1BTF1Wq8kF27eRunlF4zYEEsnMHN/f7mkpJjOrn1C qjmfIRopnV/tS/uhXYI+XpXfRqIdI5vYCXuWI= MIME-Version: 1.0 Received: by 10.204.163.129 with SMTP id a1mr8898574bky.144.1272822808158; Sun, 02 May 2010 10:53:28 -0700 (PDT) Received: by 10.204.60.78 with HTTP; Sun, 2 May 2010 10:53:28 -0700 (PDT) In-Reply-To: <1272816321-32494-1-git-send-email-felipe.contreras@gmail.com> References: <1272816321-32494-1-git-send-email-felipe.contreras@gmail.com> Date: Sun, 2 May 2010 20:53:28 +0300 Message-ID: Subject: Re: [PATCH] omap: mailbox: trivial cleanups From: Felipe Contreras To: linux-omap Cc: Hiroshi Doyu , Felipe Contreras Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 02 May 2010 17:53:31 +0000 (UTC) --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -406,21 +406,18 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev) if (unlikely(!res)) { dev_err(&pdev->dev, "invalid irq resource\n"); ret = -ENODEV; - goto err_iva1; + goto err_dsp; } mbox_iva_info.irq = res->start; ret = omap_mbox_register(&pdev->dev, &mbox_iva_info); - if (ret) - goto err_iva1; + if (ret) { + omap_mbox_unregister(&mbox_iva_info); + goto err_dsp; + } } #endif return 0; -#if defined(CONFIG_ARCH_OMAP2420) /* IVA */ -err_iva1: - omap_mbox_unregister(&mbox_iva_info); -#endif - err_dsp: iounmap(mbox_base);