From patchwork Thu Sep 1 09:02:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 12962119 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1BFCEECAAD3 for ; Thu, 1 Sep 2022 09:02:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=Ge59dbz9rulCQMQlb4iAZ48VtIXZvSfivpPz5p6O9g8=; b=wcB2qLj7dHsYgiYMA+loITSaTY Ns6witfWy18VI7/2/RbB7s67cj5iLa4bY2WkFWpyK+0xMQ9HmKUKH+zYASdhONM+6F0BhsnaOzpm8 fKTq5VvR0s4x0kZsat1ZrWoj34exSa0nqlMueSUzyVhqWyrQ7C056sEFnBfzN20HHioV2vri+Eqbx JyseW6JD8Rr3DlYC1u4lblnHkAzwEVhorTkR2hKr3ZhgTvtLM8CqyDoA9/fN2Z9juR86Kqx6ceYTw 3h7K87mici4kiEvplEwEVEGj24pgY6ItpHKhUkbnXbs78puJ9skIvK9JWKYpNb8gqsZEkLptwV2I1 GuorL3BQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTg5n-00AhUq-RA; Thu, 01 Sep 2022 09:02:31 +0000 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTg5j-00AhTH-OK for linux-mediatek@lists.infradead.org; Thu, 01 Sep 2022 09:02:30 +0000 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2816e8hx024955; Thu, 1 Sep 2022 09:02:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : content-type : mime-version; s=corp-2022-7-12; bh=Ge59dbz9rulCQMQlb4iAZ48VtIXZvSfivpPz5p6O9g8=; b=Y0VAoU2L/WdODIEJ9gAlZy3juFdHjSDjx2De8z4Zh82MVvJo/r3fu1JAn88EsVSMT4g5 /0+vkhkqNgZMgaVR1gvC/k9vcTh/m1TRxYHGnfFpJH7MCZNBfZnofHmDjDUkatkm90gZ gW/pxvYVamJDmBd7aJcGI+4BdAsDIihbabIBkhHSUlTF/ogd011850wmFOhyZC8c79up OmxuLAaDbrUwRAGxbQp6CHV6zZSbblkW6X3axCfZ+WcyP8yr4BOsiEtaAtxK02sBlHNU EiXwLgwLxsyaGYP7x8qr60+Y+A8k8DE2vUhleVMkPOYS3og0E7nIQACnAv4LA/r2tYwT rw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3j79pc39vd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 01 Sep 2022 09:02:22 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2817THef022114; Thu, 1 Sep 2022 09:02:22 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam02lp2040.outbound.protection.outlook.com [104.47.56.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3j79q5yu53-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 01 Sep 2022 09:02:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kHUlXjeiz69WJGyokAH5Ms3/Z8g+peHRto8xWYo6LRp7xcqRAbin3O9KvJ/PQEH4DBuxY1WRLzi+cLcAEZ7c33KWzDAnQqgOR2BvSgCTE/75qVDewykxA/OUJWmHqhMa9WJHLgHCHpSHCT8t6P1UA7mQjyXg9ECTPRZ1TreqLk0umuOMry0tnXSxr2mIXqRssya/0Q2bSvzAiPmWkZqk6QBL7C+UtoH8RXQd5KLHNh2+sr9oL8srjyEZUjIphUgcGyIM96KO4tkuHK8Kh/8QAYN2TIUBuvDKG1kuaB4FbgWrSJjdoIGaIeWoFYT1ySFGFTUYn/CRKplomBP9LLcGEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ge59dbz9rulCQMQlb4iAZ48VtIXZvSfivpPz5p6O9g8=; b=dCl3JCho5dr3DbzDat8sGna810Cg6RVkAGV2PiVk0Yc2o06+KAKZtSxo+EZw3ax3NZv8TraZRKwm7FatOSr3xm4rCPfDDb1AE6vTk+Ai2NsKi9/2betAm71hzZBrKlb6Eu1nXqpHHRd6dXn68UhlgrwhYSHf7U6c99j4QE3/2tITw+5Efy3yqGLltG2bt7wl2Q6oeQyFPuVOssZYa09nPPgWYn76dQ9+PbeMS/ev7G1jaHJzEmQHiC6hMgbZw8mYaMm2fTxk2WkzhWIzKJc6CDRteJ0rZFPBr2ddyCv1FQlBgL/opVkiZhzOKybjtHrBsKXVD0AGvNLPW5khG5S+gA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ge59dbz9rulCQMQlb4iAZ48VtIXZvSfivpPz5p6O9g8=; b=aKOgGTWgmzj1FlTxMMVIiQ7ejJL9m9+ee9Pkql8CkXPzpVlHp3BafEeWiI1t2a8AgiNRDyrTLKw7QAX3MOsKYc0LfOn9wpZs03/vAnfvFtlJvuDGIx0WtWd31d4HmTt30apYi3e4B1qzQsylFwTMH+h0sucD9lyYUdPejhMhHKI= Received: from MWHPR1001MB2365.namprd10.prod.outlook.com (2603:10b6:301:2d::28) by SJ0PR10MB5860.namprd10.prod.outlook.com (2603:10b6:a03:3ee::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Thu, 1 Sep 2022 09:02:19 +0000 Received: from MWHPR1001MB2365.namprd10.prod.outlook.com ([fe80::209e:de4d:68ea:c026]) by MWHPR1001MB2365.namprd10.prod.outlook.com ([fe80::209e:de4d:68ea:c026%3]) with mapi id 15.20.5566.021; Thu, 1 Sep 2022 09:02:19 +0000 Date: Thu, 1 Sep 2022 12:02:11 +0300 From: Dan Carpenter To: moudy.ho@mediatek.com Cc: linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [bug report] media: platform: mtk-mdp3: add MediaTek MDP3 driver Message-ID: Content-Disposition: inline X-ClientProxiedBy: LO4P123CA0518.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:272::11) To MWHPR1001MB2365.namprd10.prod.outlook.com (2603:10b6:301:2d::28) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c15b8484-41af-420e-658f-08da8bf8acda X-MS-TrafficTypeDiagnostic: SJ0PR10MB5860:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f0LNAVweqm4QwNkLNY4oh1m9jNL+Ez5UnapVcQN9jxqClUOpzZS5hD6m4j4HephbzCcWokTbhMRKUjiXaQQ7sQRf9th2VNB8w/T39QFxbFflzjZPLtReT3gZ2OH0GHNyYYCq26sVymGAuxvAN+oZf009OcMRntmG6tn7IgtA9xSgNjfTYr6jbQgI0c0x0pd1uL7AjMH/lHCBsdZv4KV/ajSYK2WIReVUpJY4znbsLqqAHFiuRNtEeXiG7rWLCXk6/O0aUl5o+8AwKXsXmbBNYeJxDPLtVN7IbdaCihFeHFUANS7QyXkk1vT4+AiDzEss301ki9SRTygQjxgEAlGc6NMqy6oFJDFPEpZRhKqred43TVKzOf2aO5ldRervj7GjrVJIyPRbXtX8Nrpm4ELc/lNAUiQeF72NmvmuSsSSgGu8e/4+N6iabWlbF/kmGO1VW3I5yw9jVF3Itn1mJvd0QBmf/HfyBI/5QO6JGEeHa7icSvoj6xt++D0rZckd+yIxpCUP84LFTWs+C8/1bEiJBKwM7wUJ6BobXZ8v9uiDW7GdkrP34wY7MncodoVsou/2Z9vPGdu0BKs4+TAo3i66Jc2m/PrtoxzhCYfcRvuia+xiYKLYbPo25T2nrQXYzjeihJ+OACOqhb+JnCVGloe880jNL0GviC2CcrRipnLSiY+le+Z0koxawrYPiPL5iytFZPXw06t6h27fzjALdjNQ6PorW6iTTHigQBAJoySs8hyami7C7DRiYw2WGvymlpWALoHwwF0FBAkJMdsQuzqopaCAuRvmdFhTRpJF9R2tNSo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2365.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(376002)(396003)(366004)(136003)(346002)(39860400002)(83380400001)(38350700002)(38100700002)(66946007)(66556008)(966005)(316002)(66476007)(4326008)(8676002)(478600001)(6486002)(6916009)(8936002)(6666004)(41300700001)(5660300002)(44832011)(86362001)(186003)(33716001)(26005)(6506007)(6512007)(2906002)(9686003)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gUpV9F+8RDtcZxdD6yj+pZaS5dcKAb0ufV5qzO8GWYwKHZotoiQLipV5kvdfWLjJykJb3TpLB+gtlaoRkvjDVrVfjUSX78suRVJVMCSse54xAmDNVa400fCET8/rNglOJL0ME2/PztvJQEHbyBL6xosYSQYcuPrsDz49U2kBSb0FWsTgWTi+7rL2zrUnzCHPgfOFH1Hk1lKBGHxgCMk0Tl2x7y6LwvTElqgQ+vuOJvlaiKCGBhobHz4gMhDBGBUtSmlEqqay58xu7dSpXr/4ZPb1/ODSD0PGActD8+MbfrgQdIBXX8j/vtgJs5AVVMf4Ybe2tH7nMkqd2nd7eKOOA7jOJ95vrbU5PXOdLhUhI8blHer6S63FsKXPzIYqSCOMkNdbdkEf5NnyzRsHKWpIVnX3vp16gaTSz0xLhEVRtvSjjgG1NmG6WvzXGNnJTF4zbPUTbdCR4MGcExz86NPKsjjWPSrZ2M8sP8uTtqnf3wf+8N/WwcC4hTXDWPUIO43Y+aILOekLvn0klUYQSL6x1eKTox2aVivkGcN38KNu2s0+G2pEpGFa3IQwNn/oQPoo6Oyi/qyOmSkG4wyYru/jn3nVZtV4u4qZoMvvHuwQ0i+25/4/81vsIHKsbbADQTceUpCtbF57mKZlgqmAsDhEERpgbtHKND1ZhTj+ePqunt6t0QyF/ckoEOZ1hiTrCj4Za69ielu0zOqDy1/VtTTrZi565X9Ffb9ghnM+AaEuO3tQvfqCxTcNzeehHM7aQlwfm5uHLeo6mElLIQM7gqxxfiCIgroWiEatSeeYCtDyiRuKQPspu+36Npj0oOKvK/ZoEQRjX75b/tH4kPw+jAficdF+9X+kQSV7yUBk3fu/FK3AKug94Ag+m/9MNf8NTyRutTXEnYjEtNgBRUqlvwgl6ZZMeqx8XaIbrTS1sM4QKb07CHAkXTeT4fR3FOCSSNezT93KYJqdaDING+bVXWl2UBZAEiz3/icWB7V1BorRzfQNtiWe830wbyb2OKrgJlv7RJUqZr2g8ZIgiB2KP/Pt6fs9wx+i4qzIpSK9KkRkGzWNiU5tBs7GXDH6VFgmIRilazZdnPd1mHNQdCi0cKyekZeABt3DVgbfVBOHBMCClbGoaW7TJEbCypts3ywVE+Mx6NJiGW7BxUbq1I5mPmUiuP0fbSCJU/4haMoF79XwfGw+aQK/ihIPToBOMTrTmT81mImoMckZjafI7Gy5keXlxNqKlYHtpKx4CFu9d+jVyxdi5dg3z0KXwx6n+ct7dWo2rEnBJHTG1Xi94X9PFRmsfUIYqSs0jSJCXOVSO5e3s2qsT42smG3V5kD3wCVF7Crw1WQoIlkewvTlk+q+HI/JSfG93HfF0vedjRySK1KoUFa7QI2zc4rRmvX49eRqEm1GWNhkHw4EkOmS6Ug8smj13I8rjcoXmWf+VKNhYmx+zGSYiYZnaq0i5xRfpIemrJVNRBszqooN9JweAwmPsb/FFmsHsTq/zXqPLGB9epFl6HVovuxPnT7S0T10XoyQECSygbE1J5srdwNw0ccsjNv3wejKB+O55QNNfvcKxpNfZYiPQJ9qFL1uAupZQ2x928HRV8is1MzZHZ+7ZBY+hgTmig== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c15b8484-41af-420e-658f-08da8bf8acda X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2365.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 09:02:19.7303 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Xfung1AYh0DPzqavULaZkGBlCE0WA5uF9ZsymKPU7+v2/gNfk6eogs9BIAFahtf5xWyTvUYq2SiWIBKzYAGixmNYTCCyP3Xi0gfwQRTnFS4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5860 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-09-01_06,2022-08-31_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxlogscore=999 adultscore=0 phishscore=0 spamscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2209010040 X-Proofpoint-ORIG-GUID: 6VO1hEx5jb9teaVIoqfgNfboxupHP93s X-Proofpoint-GUID: 6VO1hEx5jb9teaVIoqfgNfboxupHP93s X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220901_020228_403172_6A276214 X-CRM114-Status: GOOD ( 20.08 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Hello Moudy Ho, The patch 61890ccaefaf: "media: platform: mtk-mdp3: add MediaTek MDP3 driver" from Aug 23, 2022, leads to the following Smatch static checker warning: drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c:460 mdp_cmdq_send() error: we previously assumed 'cmd' could be null (see line 369) The error handling in mdp_cmdq_send() has a number of bugs. Dereferencing uninitialized pointers, a double free, stack traces, and not propagating the negative error code, and returning a positive number instead of a negative error codes. See below for details and potential fixes (not complete). Read my blog for more Error Handling Tips! https://staticthinking.wordpress.com/2022/04/28/free-the-last-thing-style/ + + return ret; } void mdp_comp_clock_off(struct device *dev, struct mdp_comp *comp) @@ -722,13 +733,21 @@ void mdp_comp_clock_off(struct device *dev, struct mdp_comp *comp) int mdp_comp_clocks_on(struct device *dev, struct mdp_comp *comps, int num) { - int i; + int ret, i; - for (i = 0; i < num; i++) - if (mdp_comp_clock_on(dev, &comps[i]) != 0) - return ++i; NOTE4: This function is supposed to return a negative error code. + for (i = 0; i < num; i++) { + ret = mdp_comp_clock_on(dev, &comps[i]); + if (ret) + goto err_unwind; + } return 0; + NOTE5: Same bug here. +err_unwind: + while (--i >= 0) + mdp_comp_clock_off(dev, &comps[i]); + + return ret; } void mdp_comp_clocks_off(struct device *dev, struct mdp_comp *comps, int num) diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c index 29f6c1cd3de7..0cdb62c27b58 100644 --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c @@ -252,10 +252,9 @@ static int mdp_cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *pkt, dma_addr_t dma_addr; pkt->va_base = kzalloc(size, GFP_KERNEL); - if (!pkt->va_base) { - kfree(pkt); NOTE1: Freeing here lead to a double free + if (!pkt->va_base) return -ENOMEM; - } + pkt->buf_size = size; pkt->cl = (void *)client; @@ -368,25 +367,24 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq_param *param) cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); if (!cmd) { ret = -ENOMEM; - goto err_cmdq_data; + goto err_decrement; } - if (mdp_cmdq_pkt_create(mdp->cmdq_clt, &cmd->pkt, SZ_16K)) { - ret = -ENOMEM; + ret = mdp_cmdq_pkt_create(mdp->cmdq_clt, &cmd->pkt, SZ_16K); + if (ret) goto err_cmdq_data; - } comps = kcalloc(param->config->num_components, sizeof(*comps), GFP_KERNEL); if (!comps) { ret = -ENOMEM; - goto err_cmdq_data; + goto err_destroy_pkt; } path = kzalloc(sizeof(*path), GFP_KERNEL); if (!path) { ret = -ENOMEM; - goto err_cmdq_data; + goto err_free_comps; } path->mdp_dev = mdp; @@ -406,7 +404,7 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq_param *param) ret = mdp_path_ctx_init(mdp, path); if (ret) { dev_err(dev, "mdp_path_ctx_init error\n"); - goto err_cmdq_data; + goto err_free_path; } mtk_mutex_prepare(mdp->mdp_mutex[MDP_PIPE_RDMA0]); @@ -414,7 +412,7 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq_param *param) ret = mdp_path_config(mdp, cmd, path); if (ret) { dev_err(dev, "mdp_path_config error\n"); - goto err_cmdq_data; + goto err_free_path; } cmdq_pkt_finalize(&cmd->pkt); @@ -433,7 +431,7 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq_param *param) ret = mdp_comp_clocks_on(&mdp->pdev->dev, cmd->comps, cmd->num_comps); if (ret) { dev_err(dev, "comp %d failed to enable clock!\n", ret); - goto err_clock_off; + goto err_free_path; } dma_sync_single_for_device(mdp->cmdq_clt->chan->mbox->dev, @@ -453,14 +451,20 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq_param *param) mtk_mutex_unprepare(mdp->mdp_mutex[MDP_PIPE_RDMA0]); mdp_comp_clocks_off(&mdp->pdev->dev, cmd->comps, cmd->num_comps); -err_cmdq_data: +// FIXME: what to do here? +// err_cmdq_data: +// wake_up(&mdp->callback_wq); NOTE2: not sure how why we call wake_up(&mdp->callback_wq); +err_free_path: kfree(path); - atomic_dec(&mdp->job_count); - wake_up(&mdp->callback_wq); - if (cmd->pkt.buf_size > 0) - mdp_cmdq_pkt_destroy(&cmd->pkt); +err_free_comps: kfree(comps); +err_destroy_pkt: + mdp_cmdq_pkt_destroy(&cmd->pkt); +err_free_cmd: kfree(cmd); +err_decrement: + atomic_dec(&mdp->job_count); + return ret; } EXPORT_SYMBOL_GPL(mdp_cmdq_send); diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c index e62abf3587bf..a18ac10269a6 100644 --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c @@ -699,11 +699,22 @@ int mdp_comp_clock_on(struct device *dev, struct mdp_comp *comp) dev_err(dev, "Failed to enable clk %d. type:%d id:%d\n", i, comp->type, comp->id); - return ret; + goto err_unwind; } } return 0; NOTE3: This function *must* clean up after itself. Calling clk_disable_unprepare() on an uninitialized clk will trigger a stack trace. + +err_unwind: + while (--i >= 0) { + if (IS_ERR_OR_NULL(comp->clks[i])) + continue; + clk_disable_unprepare(comp->clks[i]); + } + if (comp->comp_dev) + pm_runtime_put_sync(comp->comp_dev);