aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drm_proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core/drm_proc.c')
-rw-r--r--linux-core/drm_proc.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c
index e66edfb3..d3845bb3 100644
--- a/linux-core/drm_proc.c
+++ b/linux-core/drm_proc.c
@@ -172,7 +172,6 @@ static int drm_name_info(char *buf, char **start, off_t offset, int request,
int *eof, void *data)
{
struct drm_minor *minor = (struct drm_minor *) data;
- struct drm_master *master = minor->master;
struct drm_device *dev = minor->dev;
int len = 0;
@@ -181,16 +180,13 @@ static int drm_name_info(char *buf, char **start, off_t offset, int request,
return 0;
}
- if (!master)
- return 0;
-
*start = &buf[offset];
*eof = 0;
- if (master->unique) {
+ if (dev->unique) {
DRM_PROC_PRINT("%s %s %s\n",
dev->driver->pci_driver.name,
- pci_name(dev->pdev), master->unique);
+ pci_name(dev->pdev), dev->unique);
} else {
DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name,
pci_name(dev->pdev));