From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4549EC433E1 for ; Mon, 29 Jun 2020 21:09:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1BF4F20775 for ; Mon, 29 Jun 2020 21:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593464991; bh=rA5aTAAmo8TA8iTP7C04iQfYJE34ws41yHWBaX4nd0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zsGmIR06G+jw2Z5xfBfXQERBv5FbA6vOwWlITmRqAgYiL37KQaNHRmRpP+bQKSJ3f 5zcfcANqX+5q1kIq7/HVNEPtyrQaiP//7l5MfAP5jft9h3zicf5zKA+VbDDxpCNn6f QCkcwBtbzSm+HBPRjGx8Db26+42nDouRPQlAlBYY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388473AbgF2VJu (ORCPT ); Mon, 29 Jun 2020 17:09:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:45470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730316AbgF2TAS (ORCPT ); Mon, 29 Jun 2020 15:00:18 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7801E25503; Mon, 29 Jun 2020 15:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593446062; bh=rA5aTAAmo8TA8iTP7C04iQfYJE34ws41yHWBaX4nd0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iwDLsfcl+a27y9TmKkMBBtK0mUX7nEDs5Gz9J9LbYdHw0z+nq+4Qn47Bs+VBV50t9 t1h4++6iEKs0yrYvoYJn0+QtwnejTTrFqQd/uAA7cPdll9wSAmg0r6lOp/m6TNN6jf Dvgk8Wmw9g7xRvy9EsRJcBh0ukphhPoAct8GeeME= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wolfram Sang , Emil Velikov , Daniel Vetter , Wolfram Sang , Sasha Levin Subject: [PATCH 4.4 061/135] drm: encoder_slave: fix refcouting error for modules Date: Mon, 29 Jun 2020 11:51:55 -0400 Message-Id: <20200629155309.2495516-62-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629155309.2495516-1-sashal@kernel.org> References: <20200629155309.2495516-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:53+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wolfram Sang [ Upstream commit f78d4032de60f50fd4afaa0fb68ea03b985f820a ] module_put() balances try_module_get(), not request_module(). Fix the error path to match that. Fixes: 2066facca4c7 ("drm/kms: slave encoder interface.") Signed-off-by: Wolfram Sang Reviewed-by: Emil Velikov Acked-by: Daniel Vetter Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_encoder_slave.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c index d18b88b755c34..5c595d9f7e8f2 100644 --- a/drivers/gpu/drm/drm_encoder_slave.c +++ b/drivers/gpu/drm/drm_encoder_slave.c @@ -84,7 +84,7 @@ int drm_i2c_encoder_init(struct drm_device *dev, err = encoder_drv->encoder_init(client, dev, encoder); if (err) - goto fail_unregister; + goto fail_module_put; if (info->platform_data) encoder->slave_funcs->set_config(&encoder->base, @@ -92,9 +92,10 @@ int drm_i2c_encoder_init(struct drm_device *dev, return 0; +fail_module_put: + module_put(module); fail_unregister: i2c_unregister_device(client); - module_put(module); fail: return err; } -- 2.25.1