mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2026-05-08 22:08:44 +02:00
couple more merge fixes
This commit is contained in:
parent
3ef755f0ce
commit
f7bb776038
2 changed files with 8 additions and 8 deletions
|
|
@ -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),
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue