Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3060294ybt; Mon, 29 Jun 2020 14:13:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKjEEOfecEoi5nGtnZqeHEZ0A5tifgebHFUkDCqtWADDq7OkmPz0MpW7TCUWg1oIQTZBK3 X-Received: by 2002:aa7:c504:: with SMTP id o4mr19191174edq.311.1593465219648; Mon, 29 Jun 2020 14:13:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593465219; cv=none; d=google.com; s=arc-20160816; b=tkTdwgjGghekPsDUrZxmDsq/IDGOMkXkuxatEyZfNFr7SuWKf0cWui6UKv7C9jJdhc n3jxqgITNksXlSlv7SrPiq96nNbmJ2+wjLTeL8k1nqY2GE9Z6RlYd+1wA/Kagm2wRnNH 20AoyqkXzcZT/xtx7hL4c54Y3TVXqOc3eao8PbVJeU8FSgHmtWXDE9Vn5P5ovNgDtC4E o+hSkSPZx48TAguamsL8CtLRh/QiDUtI5MIKmx4sN5vkTpAXAaCYRZhQjlYJp2OzJrJg Uo4STVY2o2i/mTLZE+mq3z7P83RFN8xqksb+buPvN7iSDHpw9iSSw6uHXH+jV+eALdKC YHsA== 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=39Zu6jDNCdt8IINvyW3yHOhas7HwZs/5QbRGIBVd+Gk=; b=Cz9QcLgz9l/lt28PpWzd+8dDpvJfJ8mZVGFUcU7NsuvJ4xh4ErVfcxrFtZ20RSWzzw Qr/jZ+xhYPZot78yHmKg0iXj+GpNeLb5y+9Lpz3BJ6XGIkM86VXttzPi030F3zJuCols N7VdZk2yoseQM5T27p90FoVLTJkEFuYXpqFzRW71ngBDXruEDkpcQ1pSAWkLcol7UGjY lF0gUQiw1FG1u1gg9XsQ88sPofDPSKm6bADyzY7uhMLtO6E8Zb8UJ6K1BTiQE8YGpNxq rsMgpciw1GDZqNA0oztzksADBuc9/KksQG4uPC6hhDZuR9bpCayQemMIzzf21OUU+aEJ fRbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iwDLsfcl; 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 o10si394469ejn.140.2020.06.29.14.13.16; Mon, 29 Jun 2020 14:13:39 -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=iwDLsfcl; 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 S2390496AbgF2VJx (ORCPT + 99 others); Mon, 29 Jun 2020 17:09:53 -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: 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 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