diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index a007b78d..982e4231 100644
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -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),
diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h
index a007b78d..982e4231 100644
--- a/linux/drm_bufs.h
+++ b/linux/drm_bufs.h
@@ -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),