patch-2.4.0-test8 linux/drivers/char/drm/dma.c

• Lines: 23
• Date: Tue Aug 29 14:09:15 2000
• Orig file: v2.4.0-test7/linux/drivers/char/drm/dma.c
• Orig date: Thu Jul 27 17:38:00 2000

diff -u --recursive --new-file v2.4.0-test7/linux/drivers/char/drm/dma.c linux/drivers/char/drm/dma.c
@@ -486,14 +486,16 @@
 				  buf->pending);
 		}
 		buf->pid     = current->pid;
-		copy_to_user_ret(&d->request_indices[i],
+		if (copy_to_user(&d->request_indices[i],
 				 &buf->idx,
-				 sizeof(buf->idx),
-				 -EFAULT);
-		copy_to_user_ret(&d->request_sizes[i],
+				 sizeof(buf->idx)))
+			return -EFAULT;
+
+		if (copy_to_user(&d->request_sizes[i],
 				 &buf->total,
-				 sizeof(buf->total),
-				 -EFAULT);
+				 sizeof(buf->total)))
+			return -EFAULT;
+
 		++d->granted_count;
 	}
 	return 0;