From patchwork Wed Oct 30 03:10:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 20482 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VbMBG-00083t-VZ; Wed, 30 Oct 2013 04:10:50 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1VbMBF-0008KE-0T; Wed, 30 Oct 2013 04:10:50 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751556Ab3J3DKr (ORCPT + 1 other); Tue, 29 Oct 2013 23:10:47 -0400 Received: from mail-bk0-f47.google.com ([209.85.214.47]:53732 "EHLO mail-bk0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751470Ab3J3DKq (ORCPT ); Tue, 29 Oct 2013 23:10:46 -0400 Received: by mail-bk0-f47.google.com with SMTP id d7so48466bkh.6 for ; Tue, 29 Oct 2013 20:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=c4PegdR+DTX1BoRXaVMerAOslHPH6A5hw4p9ZPYTa+A=; b=tQbWe72+DRSRLv8yqzlPd6upQWD0vTwfvK3YV0kwQPQc62xqdT9cWbACpDxGzGJ5dK Y8tMUqzluC0J9tHZZf1RZEIylGd3+UGW1WzJXbNfjEV1ET2tZ6d6CtuizyIDiZZ3vdd6 IDU+wEmr4qgUD/l+pz7EVK2mIrtyZsOneaoDS/72wKOWXFIRoc/L/BLrlWVJIwFPzyBo Uvl7NOEAiyxHeub1z4gZAsJGY/MvOK0YJdHm7CpDppkz0HOmKdh9XE/FMp/LVXH8nzht rJatuFVZRhL9cuRPhMMjfoZOHAM5RKdS3h9jjyjiPBtxLS082PxU9nXduGD2DzdtsYcL 5I2A== MIME-Version: 1.0 X-Received: by 10.204.121.201 with SMTP id i9mr1383406bkr.13.1383102645834; Tue, 29 Oct 2013 20:10:45 -0700 (PDT) Received: by 10.205.19.10 with HTTP; Tue, 29 Oct 2013 20:10:45 -0700 (PDT) Date: Wed, 30 Oct 2013 11:10:45 +0800 Message-ID: Subject: [PATCH -next] [media] v4l: ti-vpe: fix error return code in vpe_probe() From: Wei Yongjun To: m.chehab@samsung.com, grant.likely@linaro.org, rob.herring@calxeda.com, archit@ti.com, hans.verkuil@cisco.com, k.debski@samsung.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.10.30.30314 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Wei Yongjun Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun Reviewed-by: Archit Taneja --- drivers/media/platform/ti-vpe/vpe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 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/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c index 4e58069..0dbfd52 100644 --- a/drivers/media/platform/ti-vpe/vpe.c +++ b/drivers/media/platform/ti-vpe/vpe.c @@ -2007,8 +2007,10 @@ static int vpe_probe(struct platform_device *pdev) vpe_top_vpdma_reset(dev); dev->vpdma = vpdma_create(pdev); - if (IS_ERR(dev->vpdma)) + if (IS_ERR(dev->vpdma)) { + ret = PTR_ERR(dev->vpdma); goto runtime_put; + } vfd = &dev->vfd; *vfd = vpe_videodev;