Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3035075ybt; Mon, 29 Jun 2020 13:30:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBrLDVUTWErUNRRo8GhxitTRxQ2V8+nvQPyHmKRVM6SOCC2MLcIl2+oGEg9q2AFPSTftIO X-Received: by 2002:a17:906:2e83:: with SMTP id o3mr11979393eji.261.1593462646099; Mon, 29 Jun 2020 13:30:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593462646; cv=none; d=google.com; s=arc-20160816; b=r8G3HRoEfsK4TI5nh1dHHmsq3Z5RVBWbatm2CKUNaOUJm2A3GlnN6jo3WTstMFpZmb ASmXLBg+MtqygN0cEqgmRV6jZh96TfX7W3XtWXjlcutRGrUvyRQ4kamECGGX4nNhvcr8 bUw9c64WzMzJMo7cqD4/fb9TX6TOhUjhqfqPxuCm+uZwl4q4EMhPi8X/eO3jDaHFn2jE F+yE5ZnbQqiS8fcRyEO1D5em7tG1XtdAohYBW+QnNQiHHVen5qHJIvuk1MdrjCe+Ac3B 9khhaW5keMm9W7i/m9UWQECmsspUFSU84GeoJP8OE7xorI7oyp77blo1fGV9KHxuJivE /xHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fzG+QiEJYb8VHbbYD2DBS6QZyVL06yiC2f2k4Voetts=; b=L0e1PDHHFPL/37OryYoNNZ5h+k2uvJmYulM/rUguDL8t9taBgT+KBpIjX7gkJxsytU n4jc1EdTn3Bp8wyorxe6sIN48fY/aDQi8oTmOMpf6tezAY108bTauHpdO/ju8wuiQiDd 2n1MwI2BZdFLqAf5Sj7w/PwwSiTQwnhiuZzut0QeMWfo95j6LPJd9O5U50qX3i4xs/oG 63+i74AnkrAKWaJI3nv9GjBmZVeprpiPS6ogkKQkyaXj+9mGNlFqzxCGIvyIqA19Vnad 8wzKFQaxHQptWQUwz+qiRdpVI5ifo6baNzBNa0N5oYW9pwwyR6WUxfMFN8qf88TDB/8k DRFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xuWU2aXH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n23si325618ejx.656.2020.06.29.13.30.23; Mon, 29 Jun 2020 13:30:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xuWU2aXH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732548AbgF2U2j (ORCPT + 99 others); Mon, 29 Jun 2020 16:28:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:37016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731915AbgF2TZX (ORCPT ); Mon, 29 Jun 2020 15:25:23 -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 6F301253D5; Mon, 29 Jun 2020 15:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445313; bh=RmTDezy6hZt05vV+jmzma07hfeiH2tf0VjuQT1izrRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xuWU2aXHUIxXrpYixJHxBeXXTRyxPOzgFrYKBVfsqV3RiACUalbxYfnDTlvwlGUph DDXcF67paeoOyv+kNwCsrtH94sGmzRkE/EO6oxCce8FjHo15h0fXArcglH8IbGkmy7 4DJJT1Fwx2TkctB4CRa/o94Zq2EG5VrsD4rBrAwc= 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.9 081/191] drm: encoder_slave: fix refcouting error for modules Date: Mon, 29 Jun 2020 11:38:17 -0400 Message-Id: <20200629154007.2495120-82-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629154007.2495120-1-sashal@kernel.org> References: <20200629154007.2495120-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.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.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.9.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:39+00:00 X-stable: review X-Patchwork-Hint: Ignore 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 4484785cd9ac2..95d5a59497530 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