sr: Switch the sector size back to 2048 if sr_read_sector() changed it.

[linux-2.6-microblaze.git] / drivers / scsi / sr_ioctl.c

diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index ffcf902..5703f84 100644 (file)
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -549,6 +549,8 @@ static int sr_read_sector(Scsi_CD *cd, int lba, int blksize, unsigned char *dest
        cgc.timeout = IOCTL_TIMEOUT;
        rc = sr_do_ioctl(cd, &cgc);
 
+       if (blksize != CD_FRAMESIZE)
+               rc |= sr_set_blocklength(cd, CD_FRAMESIZE);
        return rc;
 }