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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 6CCC0C433DF for ; Tue, 23 Jun 2020 21:10:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C829204EA for ; Tue, 23 Jun 2020 21:10:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592946636; bh=YkVoEorFSdIv9ryto11yZN9u8v2/IijlcqCT9u3qakE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uHOU72hZ73nRKvqmhH39O4EnfGtdPlcbtm78dtisSU8kaf6OYUZ0vgRnCptWiRdPO rCX8n9MazGRH72ZobfsBd8hbhioAaB/EXUZPtF2weKBvtoUkEfpjithQqcB1ae6QPR YWT4L01ZEU0wnKha6a0FjHrrbn7927NUb3WL3ogw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391371AbgFWUdC (ORCPT ); Tue, 23 Jun 2020 16:33:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:53948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390573AbgFWUcy (ORCPT ); Tue, 23 Jun 2020 16:32:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7B5EB20702; Tue, 23 Jun 2020 20:32:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944374; bh=YkVoEorFSdIv9ryto11yZN9u8v2/IijlcqCT9u3qakE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2S8TfC6v9QUbiD7/Sc2ywr++EQAthOsZmB6OwYlS7m6w0ErX354Dw8ancQkAzfIsg B1F7M9UIAVbPthO9Vk5jePefziTeywRvFHyzMWj23+9STEtJXkgdQ9afnbnKz0NVC/ 3goCqnioa+NRgfRP8q0nO2my8hSl1MTifnUxTvjQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wolfram Sang , Emil Velikov , Daniel Vetter , Wolfram Sang , Sasha Levin Subject: [PATCH 5.4 280/314] drm: encoder_slave: fix refcouting error for modules Date: Tue, 23 Jun 2020 21:57:55 +0200 Message-Id: <20200623195352.338196405@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195338.770401005@linuxfoundation.org> References: <20200623195338.770401005@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 cf804389f5eca..d50a7884e69e1 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