Merge ../scsi-rc-fixes-2.6

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index febfac97ad38..587274dd7059 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -1177,7 +1177,10 @@ static int st_open(struct inode *inode, struct file *filp)
                 goto err_out;
         if ((filp->f_flags & O_NONBLOCK) == 0 &&
             retval != CHKRES_READY) {
-                retval = (-EIO);
+                if (STp->ready == NO_TAPE)
+                        retval = (-ENOMEDIUM);
+                else
+                        retval = (-EIO);
                 goto err_out;
         }
         return 0;