---

yaml --- r: 124667 b: refs/heads/master c: ccc607f h: refs/heads/master i: 124665: ab6e566 124663: c68a85b v: v3
git-mirror · Dec 29, 2008 · d1ce56c · d1ce56c
1 parent f916a64
commit d1ce56c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a31ec3c1ff1ceeb3aebe25e13def5ac4edd5dc4
+refs/heads/master: ccc607f6d29def18a4c2a4aab31435a784754a64
diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c
@@ -2852,12 +2852,15 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon
 		return (-ENOSYS);
 	}
 
-	SRpnt = st_do_scsi(NULL, STp, cmd, datalen, direction,
-			   timeout, MAX_RETRIES, 1);
+	SRpnt = st_allocate_request(STp);
 	if (!SRpnt)
 		return (STp->buffer)->syscall_result;
 
-	ioctl_result = (STp->buffer)->syscall_result;
+	ioctl_result = st_scsi_kern_execute(SRpnt, cmd, direction,
+					    STp->buffer->b_data, datalen,
+					    timeout, MAX_RETRIES);
+	if (!ioctl_result)
+		ioctl_result = (STp->buffer)->syscall_result;
 
 	if (!ioctl_result) {	/* SCSI command successful */
 		st_release_request(SRpnt);