diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-04-08 12:09:10 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-04-08 12:09:10 +0000 |
| commit | 1bc7576474a85b649e2f3291d72890363e6d1483 (patch) | |
| tree | c51812f9d798d927f4c7f50ff25cb004fcfc83f8 | |
| parent | bc1428035ceb5300df429d09a64a20a2a7e903b2 (diff) | |
| download | drm-1bc7576474a85b649e2f3291d72890363e6d1483.tar.gz | |
patch from Linux kernel 2.6.5
| -rw-r--r-- | linux-core/drm_drv.c | 2 | ||||
| -rw-r--r-- | linux/drm_drv.h | 2 | ||||
| -rw-r--r-- | linux/gamma_context.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 83b9600c..06eaf3b9 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -601,7 +601,7 @@ static int DRM(probe)(struct pci_dev *pdev) DRM_ERROR( "Cannot initialize the agpgart module.\n" ); DRM(stub_unregister)(dev->minor); DRM(takedown)( dev ); - return -ENOMEM; + return -EINVAL; } #endif #if __REALLY_HAVE_MTRR diff --git a/linux/drm_drv.h b/linux/drm_drv.h index 83b9600c..06eaf3b9 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -601,7 +601,7 @@ static int DRM(probe)(struct pci_dev *pdev) DRM_ERROR( "Cannot initialize the agpgart module.\n" ); DRM(stub_unregister)(dev->minor); DRM(takedown)( dev ); - return -ENOMEM; + return -EINVAL; } #endif #if __REALLY_HAVE_MTRR diff --git a/linux/gamma_context.h b/linux/gamma_context.h index 2338cb38..df319c03 100644 --- a/linux/gamma_context.h +++ b/linux/gamma_context.h @@ -84,7 +84,7 @@ ssize_t DRM(read)(struct file *filp, char *buf, size_t count, loff_t *off) } wake_up_interruptible(&dev->buf_writers); - return DRM_MIN(avail, count);; + return DRM_MIN(avail, count); } |