changeset 10018:e84d215463a7

6834482 Solaris installation fails to install from live USB-- hangs on AA1
author guoqing zhu - Sun Microsystems - Beijing China <Guoqing.Zhu@Sun.COM>
date Thu, 02 Jul 2009 10:06:17 +0800
parents d778b606e96c
children 1e29dbfb7b3b
files usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c	Wed Jul 01 17:31:33 2009 -0700
+++ b/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c	Thu Jul 02 10:06:17 2009 +0800
@@ -3315,8 +3315,10 @@
 	 */
 	case SCMD_MODE_SENSE:
 	case SCMD_MODE_SELECT:
-		if ((pkt->pkt_cdbp[2] == SD_MODE_SENSE_PAGE3_CODE) ||
-		    (pkt->pkt_cdbp[2] == SD_MODE_SENSE_PAGE4_CODE)) {
+		if (((pkt->pkt_cdbp[2] & SD_MODE_SENSE_PAGE_MASK)
+		    == SD_MODE_SENSE_PAGE3_CODE) ||
+		    ((pkt->pkt_cdbp[2] & SD_MODE_SENSE_PAGE_MASK)
+		    == SD_MODE_SENSE_PAGE4_CODE)) {
 			if (cmd->cmd_bp) {
 				cmd->cmd_pkt->pkt_resid = cmd->cmd_bp->b_bcount;
 			}
--- a/usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h	Wed Jul 01 17:31:33 2009 -0700
+++ b/usr/src/uts/common/sys/usb/scsa2usb/scsa2usb.h	Thu Jul 02 10:06:17 2009 +0800
@@ -217,6 +217,8 @@
 #define	SD_MODE_SENSE_PAGE4_CODE	0x04
 #endif
 
+#define	SD_MODE_SENSE_PAGE_MASK		0x3F
+
 /*
  * PM support
  */