diff --git a/[refs] b/[refs]
index 7e70b1c10d00..efb318d362ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8490f3a77805d04321d9e44486a679801a035b8
+refs/heads/master: 8f3b8fa9afe75cafc4feb317d305444f6c5271fb
diff --git a/trunk/drivers/scsi/aic94xx/aic94xx_tmf.c b/trunk/drivers/scsi/aic94xx/aic94xx_tmf.c
index 61234384503b..fd5269e086a6 100644
--- a/trunk/drivers/scsi/aic94xx/aic94xx_tmf.c
+++ b/trunk/drivers/scsi/aic94xx/aic94xx_tmf.c
@@ -566,6 +566,11 @@ static int asd_initiate_ssp_tmf(struct domain_device *dev, u8 *lun,
 		res = TMF_RESP_FUNC_ESUPP;
 		break;
 	default:
+		if (tmf == TMF_QUERY_TASK) {
+			ASD_DPRINTK("%s: QUERY_SSP_TASK response: 0x%x\n",
+				    __FUNCTION__, res);
+			break;
+		}
 		ASD_DPRINTK("%s: converting result 0x%x to TMF_RESP_FUNC_FAILED\n",
 			    __FUNCTION__, res);
 		res = TMF_RESP_FUNC_FAILED;