summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/sis_mm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci/drm/sis_mm.c')
-rw-r--r--sys/dev/pci/drm/sis_mm.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/sys/dev/pci/drm/sis_mm.c b/sys/dev/pci/drm/sis_mm.c
index 5f4412cb34c..07f3f575f45 100644
--- a/sys/dev/pci/drm/sis_mm.c
+++ b/sys/dev/pci/drm/sis_mm.c
@@ -88,16 +88,8 @@ int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_fb_t *fb = data;
- if (dev_priv == NULL) {
- dev->dev_private = drm_calloc(1, sizeof(drm_sis_private_t),
- DRM_MEM_DRIVER);
- dev_priv = dev->dev_private;
- if (dev_priv == NULL)
- return ENOMEM;
- }
-
if (dev_priv->FBHeap != NULL)
- return EINVAL;
+ return (EINVAL);
dev_priv->FBHeap = mmInit(fb->offset, fb->size);
@@ -164,14 +156,6 @@ int sis_ioctl_agp_init(struct drm_device *dev, void *data, struct drm_file *file
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_agp_t *agp = data;
- if (dev_priv == NULL) {
- dev->dev_private = drm_calloc(1, sizeof(drm_sis_private_t),
- DRM_MEM_DRIVER);
- dev_priv = dev->dev_private;
- if (dev_priv == NULL)
- return ENOMEM;
- }
-
if (dev_priv->AGPHeap != NULL)
return EINVAL;