couple more merge fixes

This commit is contained in:
Alan Hourihane 2001-07-23 08:39:37 +00:00
parent 3ef755f0ce
commit f7bb776038
2 changed files with 8 additions and 8 deletions

View file

@ -425,9 +425,9 @@ int DRM(addbufs_agp)( DRM_OS_IOCTL )
}
if (count < 0 || count > 4096) {
up( &dev->struct_sem );
DRM_OS_UNLOCK;
atomic_dec( &dev->buf_alloc );
return -EINVAL;
DRM_OS_RETURN(EINVAL);
}
entry->buflist = DRM(alloc)( count * sizeof(*entry->buflist),
@ -768,9 +768,9 @@ int DRM(addbufs_sg)( DRM_OS_IOCTL )
}
if (count < 0 || count > 4096) {
up( &dev->struct_sem );
DRM_OS_UNLOCK;
atomic_dec( &dev->buf_alloc );
return -EINVAL;
DRM_OS_RETURN(EINVAL);
}
entry->buflist = DRM(alloc)( count * sizeof(*entry->buflist),

View file

@ -425,9 +425,9 @@ int DRM(addbufs_agp)( DRM_OS_IOCTL )
}
if (count < 0 || count > 4096) {
up( &dev->struct_sem );
DRM_OS_UNLOCK;
atomic_dec( &dev->buf_alloc );
return -EINVAL;
DRM_OS_RETURN(EINVAL);
}
entry->buflist = DRM(alloc)( count * sizeof(*entry->buflist),
@ -768,9 +768,9 @@ int DRM(addbufs_sg)( DRM_OS_IOCTL )
}
if (count < 0 || count > 4096) {
up( &dev->struct_sem );
DRM_OS_UNLOCK;
atomic_dec( &dev->buf_alloc );
return -EINVAL;
DRM_OS_RETURN(EINVAL);
}
entry->buflist = DRM(alloc)( count * sizeof(*entry->buflist),