From patchwork Tue Jun 23 19:58:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223319 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, 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 A567EC433E1 for ; Tue, 23 Jun 2020 20:58:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73D2B20656 for ; Tue, 23 Jun 2020 20:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945903; bh=YkVoEorFSdIv9ryto11yZN9u8v2/IijlcqCT9u3qakE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dz4NZ0r119Qqa+jNHHgBeemugJHooZlFwA/g/3MXi3itD/ovcCRlWDNIKfprBEZfY CsHWd/riNEypFKv21L92l29AJINM1yHraQUu1L/N7nF9xZIKPEh+6iXK11FwVUtpjS LLMCjiqij4XCWV1iLT4avkLDsVKUEcoQFauaN0pQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403883AbgFWUlv (ORCPT ); Tue, 23 Jun 2020 16:41:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:38392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403880AbgFWUlu (ORCPT ); Tue, 23 Jun 2020 16:41:50 -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 ECFA72053B; Tue, 23 Jun 2020 20:41:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944910; bh=YkVoEorFSdIv9ryto11yZN9u8v2/IijlcqCT9u3qakE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QOGNZPXwi/UreCPjLqYAOodNxAyS2AV0hOBf4n/+qFYsWdfTR30fweYd+JRv9PfMU j0ruvmW/2D0BhJOtacUrL2FAXSYm8fUYlizfSZ6kK78JzgNL6OcV/FosneUXZmy/jR qPwgdMYxKZvHS+ge6BP7RjLPcD7pAd2t1Es6LZCg= 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 4.19 173/206] drm: encoder_slave: fix refcouting error for modules Date: Tue, 23 Jun 2020 21:58:21 +0200 Message-Id: <20200623195325.537589968@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 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; }