From patchwork Thu Sep 15 03:36:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 37072 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bkNTP-0002Jx-9x; Thu, 15 Sep 2016 03:36:27 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-6) with esmtp id 1bkNTL-00066l-5Q; Thu, 15 Sep 2016 05:36:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755877AbcIODgR (ORCPT + 1 other); Wed, 14 Sep 2016 23:36:17 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34400 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755279AbcIODgQ (ORCPT ); Wed, 14 Sep 2016 23:36:16 -0400 Received: by mail-pf0-f195.google.com with SMTP id 21so178724pfy.1 for ; Wed, 14 Sep 2016 20:36:15 -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=da4sqxdQBRRqz2vAzxu6yQrDCkCLkkA1I2pIerCMqLc=; b=NSJVIwsNMN+SIK+MXD0zjtlA3PoIEahgeWA5GB+/AWU92pvxkSX1wyPAxxLwauQhMU YTCZc/5E1RPXNxvQy9E4yTixglIA3LT1l5Hr72y1Pex7Y6Pobrz888xoOuZ3FukeQ4uu +kAW7rN/aTmoiTMHjSozFNNFOqWlyesSNGkrRSUdu803qzSC1PAtsxj7duBhUDW2AxUv oOi5CHRgUPU1wCWE4mT+0i9/hjlVB021bYFf+pHTjyer7m5swqId3a9jn+fLuJrDLeNS 1RXxGSJw8Hfmplbl7jPQBMy/NdluiIB4Pi+ynmWL3xtIH2YWkR0gcXKK5S/CSjgUB5eg pPog== 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=da4sqxdQBRRqz2vAzxu6yQrDCkCLkkA1I2pIerCMqLc=; b=UDa3GHiIdh/j9kz5ytnsM26q+lJNv/AZG/XL8AUYBjd8RuWLuT/7pV7jFuFAbToz6J LAZVzL3l46HUR/sF4wcerHX75h8PRLBrNPh3mXBIRwaCwPWEUoJqL4l0X2xvoEPNcr6j FPgWOVUsSq2DGfd6kZfPEjSKXoJjmiljdPNMhpHjDnCH7g4IO0TUF1oGXFSWjyBHlo/D bEc/PsjAErlG4ZqNYibl6V76DNtBwExINAV39EDqglc8u8snOVSBaHI83DsNhsvB7xlu TB+HSSif89HFxawe+Zy+uabL50fEwQZ90DiwjsldcAV0kH91rTp8AnHr6DXISr9vzBD/ XCfw== X-Gm-Message-State: AE9vXwO5SRJ+k/KahcPhLKuGOE+F0aFy0+noj/R9GEmHzWD1jpexnwyJz6xKlZJUfyERBw== X-Received: by 10.98.133.10 with SMTP id u10mr10629164pfd.134.1473910575310; Wed, 14 Sep 2016 20:36:15 -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 n7sm41054225pfg.45.2016.09.14.20.36.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Sep 2016 20:36:14 -0700 (PDT) From: Wei Yongjun To: Hans Verkuil , Mauro Carvalho Chehab Cc: Wei Yongjun , linux-media@vger.kernel.org Subject: [PATCH -next] [media] vivid: fix error return code in vivid_create_instance() Date: Thu, 15 Sep 2016 03:36:09 +0000 Message-Id: <1473910569-4677-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-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.9.15.32421 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' 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_1400_1499 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, NO_URI_HTTPS 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __STOCK_PHRASE_7 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' From: Wei Yongjun Fix to return error code -ENOMEM from the memory or workqueue alloc error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun --- drivers/media/platform/vivid/vivid-core.c | 5 ++++- 1 file changed, 4 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/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index 741460a..5464fef 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -839,6 +839,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->radio_tx_caps = V4L2_CAP_RDS_OUTPUT | V4L2_CAP_MODULATOR | V4L2_CAP_READWRITE; + ret = -ENOMEM; /* initialize the test pattern generator */ tpg_init(&dev->tpg, 640, 360); if (tpg_alloc(&dev->tpg, MAX_ZOOM * MAX_WIDTH)) @@ -1033,8 +1034,10 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) */ dev->cec_workqueue = alloc_ordered_workqueue("vivid-%03d-cec", WQ_MEM_RECLAIM, inst); - if (!dev->cec_workqueue) + if (!dev->cec_workqueue) { + ret = -ENOMEM; goto unreg_dev; + } /* start creating the vb2 queues */ if (dev->has_vid_cap) {