mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: "Noralf Trønnes" <noralf@tronnes.org>,
	"Daniel Vetter" <daniel.vetter@ffwll.ch>,
	"Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
Subject: [PATCH AUTOSEL for 4.4 07/25] drm: drm_minor_register(): Clean up debugfs on failure
Date: Wed, 25 Oct 2017 01:56:14 +0000	[thread overview]
Message-ID: <20171025015607.24625-7-alexander.levin@verizon.com> (raw)
In-Reply-To: <20171025015607.24625-1-alexander.levin@verizon.com>

From: Noralf Trønnes <noralf@tronnes.org>

[ Upstream commit a67834f8bfa1e2f48bb27d07b9a552ba7c3af82a ]

Call drm_debugfs_cleanup() in case drm_debugfs_init() fails to
cover for failure in the drm_driver.debugfs_init callback.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170126225621.12314-3-noralf@tronnes.org
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
 drivers/gpu/drm/drm_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 7dd6728dd092..ccc2044af831 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -312,7 +312,7 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)
 	ret = drm_debugfs_init(minor, minor->index, drm_debugfs_root);
 	if (ret) {
 		DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n");
-		return ret;
+		goto err_debugfs;
 	}
 
 	ret = device_add(minor->kdev);
-- 
2.11.0

  parent reply	other threads:[~2017-10-25  1:58 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-25  1:56 [PATCH AUTOSEL for 4.4 01/25] [media] adv7604: Initialize drive strength to default when using DT Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 03/25] PCI: mvebu: Handle changes to the bridge windows while enabled Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 02/25] video: fbdev: pmag-ba-fb: Remove bad `__init' annotation Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 04/25] xen/netback: set default upper limit of tx/rx queues to 8 Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 06/25] dt-bindings: clockgen: Add compatible string for LS1012A Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` Levin, Alexander (Sasha Levin) [this message]
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 05/25] ARM: dts: imx53-qsb-common: fix FEC pinmux config Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 11/25] ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6 Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 09/25] iommu/arm-smmu-v3: Clear prior settings when updating STEs Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 08/25] KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 10/25] powerpc/corenet: explicitly disable the SDHC controller on kmcoge4 Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 15/25] dt-bindings: Add vendor prefix for LEGO Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 16/25] phy: increase size of MII_BUS_ID_SIZE and bus_id Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 12/25] crypto: vmx - disable preemption to enable vsx in aes_ctr.c Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 13/25] iio: trigger: free trigger resource correctly Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 14/25] dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 20/25] IPsec: do not ignore crypto err in ah4 input Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 17/25] serial: sh-sci: Fix register offsets for the IRDA serial port Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 19/25] netfilter: nft_meta: deal with PACKET_LOOPBACK in netdev family Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 18/25] usb: hcd: initialize hcd->flags to 0 when rm hcd Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 23/25] IB/ipoib: Change list_del to list_del_init in the tx object Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 21/25] Input: mpr121 - handle multiple bits change of status register Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 24/25] s390/qeth: issue STARTLAN as first IPA command Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 22/25] Input: mpr121 - set missing event capability Levin, Alexander (Sasha Levin)
2017-10-25  1:56 ` [PATCH AUTOSEL for 4.4 25/25] net: dsa: select NET_SWITCHDEV Levin, Alexander (Sasha Levin)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171025015607.24625-7-alexander.levin@verizon.com \
    --to=alexander.levin@verizon.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=linux-kernel@vger.kernel.org \
    --cc=noralf@tronnes.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®