patch from Linux kernel 2.6.5

main
Dave Airlie 2004-04-08 12:09:10 +00:00
parent bc1428035c
commit 1bc7576474
3 changed files with 3 additions and 3 deletions

View File

@ -601,7 +601,7 @@ static int DRM(probe)(struct pci_dev *pdev)
DRM_ERROR( "Cannot initialize the agpgart module.\n" ); DRM_ERROR( "Cannot initialize the agpgart module.\n" );
DRM(stub_unregister)(dev->minor); DRM(stub_unregister)(dev->minor);
DRM(takedown)( dev ); DRM(takedown)( dev );
return -ENOMEM; return -EINVAL;
} }
#endif #endif
#if __REALLY_HAVE_MTRR #if __REALLY_HAVE_MTRR

View File

@ -601,7 +601,7 @@ static int DRM(probe)(struct pci_dev *pdev)
DRM_ERROR( "Cannot initialize the agpgart module.\n" ); DRM_ERROR( "Cannot initialize the agpgart module.\n" );
DRM(stub_unregister)(dev->minor); DRM(stub_unregister)(dev->minor);
DRM(takedown)( dev ); DRM(takedown)( dev );
return -ENOMEM; return -EINVAL;
} }
#endif #endif
#if __REALLY_HAVE_MTRR #if __REALLY_HAVE_MTRR

View File

@ -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); wake_up_interruptible(&dev->buf_writers);
return DRM_MIN(avail, count);; return DRM_MIN(avail, count);
} }