diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-10-01 04:21:50 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-10-01 07:08:53 -0400 |
commit | f1a28ee238bddfa48c5233543926af65a4445bf6 (patch) | |
tree | 8c85daf15ebb26caa7f0739f28807883e886a741 /drivers | |
parent | 7a1c2f6c8d8485af5ac6c2a313f6a7162207a4af (diff) |
vmwgfx: Remove initialisation of dev::devname
The removed code causes oopses with newer drms on master drop.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 6bbe703e7d97..a96ed6d9d010 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -148,7 +148,6 @@ static struct pci_device_id vmw_pci_id_list[] = { | |||
148 | {0, 0, 0} | 148 | {0, 0, 0} |
149 | }; | 149 | }; |
150 | 150 | ||
151 | static char *vmw_devname = "vmwgfx"; | ||
152 | static int enable_fbdev; | 151 | static int enable_fbdev; |
153 | 152 | ||
154 | static int vmw_probe(struct pci_dev *, const struct pci_device_id *); | 153 | static int vmw_probe(struct pci_dev *, const struct pci_device_id *); |
@@ -407,9 +406,6 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) | |||
407 | "running the device in SVGA mode yet.\n"); | 406 | "running the device in SVGA mode yet.\n"); |
408 | } | 407 | } |
409 | 408 | ||
410 | if (!dev->devname) | ||
411 | dev->devname = vmw_devname; | ||
412 | |||
413 | if (dev_priv->capabilities & SVGA_CAP_IRQMASK) { | 409 | if (dev_priv->capabilities & SVGA_CAP_IRQMASK) { |
414 | ret = drm_irq_install(dev); | 410 | ret = drm_irq_install(dev); |
415 | if (unlikely(ret != 0)) { | 411 | if (unlikely(ret != 0)) { |
@@ -466,8 +462,6 @@ static int vmw_driver_unload(struct drm_device *dev) | |||
466 | 462 | ||
467 | if (dev_priv->capabilities & SVGA_CAP_IRQMASK) | 463 | if (dev_priv->capabilities & SVGA_CAP_IRQMASK) |
468 | drm_irq_uninstall(dev_priv->dev); | 464 | drm_irq_uninstall(dev_priv->dev); |
469 | if (dev->devname == vmw_devname) | ||
470 | dev->devname = NULL; | ||
471 | if (dev_priv->enable_fb) { | 465 | if (dev_priv->enable_fb) { |
472 | vmw_fb_close(dev_priv); | 466 | vmw_fb_close(dev_priv); |
473 | vmw_kms_restore_vga(dev_priv); | 467 | vmw_kms_restore_vga(dev_priv); |