---

yaml --- r: 14445 b: refs/heads/master c: 15534d3 h: refs/heads/master i: 14443: 22a06ed v: v3
git-mirror · Nov 18, 2005 · 57a1147 · 57a1147
1 parent 9c38338
commit 57a1147
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f0d50391adf371a0e66da0a1a44ba5cc6744ee8
+refs/heads/master: 15534d3803993345d8db32246ec329d8f83502e1
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
@@ -1017,10 +1017,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
 				status = -ENOMEM;
 				goto cleanup1;
 			}
-			if (ioc->Request.Type.Direction == XFER_WRITE &&
-				copy_from_user(buff[sg_used], data_ptr, sz)) {
+			if (ioc->Request.Type.Direction == XFER_WRITE) {
+				if (copy_from_user(buff[sg_used], data_ptr, sz)) {
 					status = -ENOMEM;
-					goto cleanup1;			
+					goto cleanup1;
+				}
 			} else {
 				memset(buff[sg_used], 0, sz);
 			}