diff options
| author | Maxime Ripard <[email protected]> | 2019-10-03 07:59:29 +0000 |
|---|---|---|
| committer | Maxime Ripard <[email protected]> | 2019-10-03 07:59:29 +0000 |
| commit | 77fdaa091d79c87323a9f3912a25f73e02ea2a01 (patch) | |
| tree | 0e47e2d3c4a966277dbaec075f4685187fdae482 /drivers/gpu/drm/omapdrm/dss/dss.c | |
| parent | drm/omap: fix max fclk divider for omap36xx (diff) | |
| parent | Linux 5.4-rc1 (diff) | |
| download | kernel-77fdaa091d79c87323a9f3912a25f73e02ea2a01.tar.gz kernel-77fdaa091d79c87323a9f3912a25f73e02ea2a01.zip | |
Merge drm/drm-fixes into drm-misc-fixes
We haven't backmerged for a while, let's start the -rc period by pulling
rc1.
Signed-off-by: Maxime Ripard <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/dss.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dss.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index 25b6a79dc385..4bdd63b57100 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -923,7 +923,6 @@ dss_debugfs_create_file(struct dss_device *dss, const char *name, void *data) { struct dss_debugfs_entry *entry; - struct dentry *d; entry = kzalloc(sizeof(*entry), GFP_KERNEL); if (!entry) @@ -931,15 +930,9 @@ dss_debugfs_create_file(struct dss_device *dss, const char *name, entry->show_fn = show_fn; entry->data = data; + entry->dentry = debugfs_create_file(name, 0444, dss->debugfs.root, + entry, &dss_debug_fops); - d = debugfs_create_file(name, 0444, dss->debugfs.root, entry, - &dss_debug_fops); - if (IS_ERR(d)) { - kfree(entry); - return ERR_CAST(d); - } - - entry->dentry = d; return entry; } |