From patchwork Thu Sep 15 02:21:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 9332765 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F3A96089F for ; Thu, 15 Sep 2016 02:21:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7785829001 for ; Thu, 15 Sep 2016 02:21:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6BD0E29003; Thu, 15 Sep 2016 02:21:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E557129003 for ; Thu, 15 Sep 2016 02:21:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933796AbcIOCVy (ORCPT ); Wed, 14 Sep 2016 22:21:54 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:34880 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933641AbcIOCVv (ORCPT ); Wed, 14 Sep 2016 22:21:51 -0400 Received: by mail-pa0-f65.google.com with SMTP id pp5so1471162pac.2 for ; Wed, 14 Sep 2016 19:21:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KQU14D3elbtV6OHsyPXXCjv8GNsT5A5d1XR3T7Ypyxg=; b=fmV3N9/cUU75hFQGb91jkb4ROhjwdQR2Zqod7wxAg/eRqRmYtOnhbgKB1LhYVB9Ijw K+fX4g0SSniwpzX0O41X+vv3oB2AWEa6avPQjDiQv+tgKT96fqdvrOsaa+wcSizpTN1W EOkkPJuIv+gO5WVXXiE8nlxwnrcMf8RSZK13WaNQHC4f+aAT/RdCak4wOdhG7b1b1Ro0 Q1+9HPIKDUnfXKWTRsMFjN0BljraGu+DRlo1KhguMKAplqEUuE0gfmRhoXk3Xf3YBLGN NeVBOIE1i7TC/0xho7LNGI5suWlPJhzSBvtZc80VmD2PBR6jS4UJtunDPfxIyLw9Y3D0 DKIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KQU14D3elbtV6OHsyPXXCjv8GNsT5A5d1XR3T7Ypyxg=; b=YiPDLljNz5RewltAOR4Cv8s5mXl+MgqSrYOFPi6RLdTwTHNXTIga7lWVl50okadHxH ogDYE5LNeX6bqPhdhf4WJMBFUfJu222WSzKIwcmEjQbSEz3AO35/s6kv5n/UzlJ4QSqI N/hDNRsdFpGsAkRHL6L4scr3Ky36c731Bd9GUiV0EdAGCoFmbaFgp6Cw+c2peRbLYdC8 P4aOEP540bnc6KgOMgHRG80FxYxnqRJK4YOgcZR4g8Fz+Pb/lxQaYgscCf80rm+rF3q+ FUxy8fHBbcscnt0uDjvpynlq3JIjSr7h4srAYkr0jzlyr3UQ3TUgValfq8wPT8/hcqo1 ohsg== X-Gm-Message-State: AE9vXwNa6izOaemYMkUD4PVzv9VVHV3oQTQqTrvwEQbQR7Mh5hOcnXQ5b+fFAiUnGzRzXQ== X-Received: by 10.66.232.106 with SMTP id tn10mr10437840pac.130.1473906111204; Wed, 14 Sep 2016 19:21:51 -0700 (PDT) Received: from localhost.localdomain.localdomain (ec2-52-192-197-227.ap-northeast-1.compute.amazonaws.com. [52.192.197.227]) by smtp.gmail.com with ESMTPSA id t16sm13696493pfj.76.2016.09.14.19.21.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Sep 2016 19:21:50 -0700 (PDT) From: Wei Yongjun To: Mauro Carvalho Chehab , Robert Jarzmik , Hans Verkuil , Guennadi Liakhovetski , Arnd Bergmann Cc: Wei Yongjun , linux-media@vger.kernel.org Subject: [PATCH -next] [media] pxa_camera: fix error return code in pxa_camera_probe() Date: Thu, 15 Sep 2016 02:21:45 +0000 Message-Id: <1473906105-29387-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun Fix to return error code -ENODEV from dma_request_slave_channel_compat() error handling case instead of 0, as done elsewhere in this function. Also fix to release resources in v4l2_clk_register() error handling. Signed-off-by: Wei Yongjun Acked-by: Robert Jarzmik --- drivers/media/platform/pxa_camera.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c index 1bce7eb..8035290 100644 --- a/drivers/media/platform/pxa_camera.c +++ b/drivers/media/platform/pxa_camera.c @@ -2402,6 +2402,7 @@ static int pxa_camera_probe(struct platform_device *pdev) ¶ms, &pdev->dev, "CI_U"); if (!pcdev->dma_chans[1]) { dev_err(&pdev->dev, "Can't request DMA for Y\n"); + err = -ENODEV; goto exit_free_dma_y; } @@ -2411,6 +2412,7 @@ static int pxa_camera_probe(struct platform_device *pdev) ¶ms, &pdev->dev, "CI_V"); if (!pcdev->dma_chans[2]) { dev_err(&pdev->dev, "Can't request DMA for V\n"); + err = -ENODEV; goto exit_free_dma_u; } @@ -2461,8 +2463,10 @@ static int pxa_camera_probe(struct platform_device *pdev) pcdev->mclk_clk = v4l2_clk_register(&pxa_camera_mclk_ops, clk_name, NULL); - if (IS_ERR(pcdev->mclk_clk)) - return PTR_ERR(pcdev->mclk_clk); + if (IS_ERR(pcdev->mclk_clk)) { + err = PTR_ERR(pcdev->mclk_clk); + goto exit_free_v4l2dev; + } } err = v4l2_async_notifier_register(&pcdev->v4l2_dev, &pcdev->notifier);