Merge tag 'pwm/for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[~andy/linux] / drivers / scsi / pm8001 / pm8001_sas.c

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index a85d73de7c80c730260362ae56a7688189459ee6..f4eb18e5163152b414fc8b0a08b4a07a7f844111 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -447,7 +447,6 @@ static int pm8001_task_exec(struct sas_task *task, const int num,
                        break;
                case SAS_PROTOCOL_SATA:
                case SAS_PROTOCOL_STP:
-               case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:
                        rc = pm8001_task_prep_ata(pm8001_ha, ccb);
                        break;
                default:
@@ -704,6 +703,8 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev,
        int res, retry;
        struct sas_task *task = NULL;
        struct pm8001_hba_info *pm8001_ha = pm8001_find_ha_by_dev(dev);
+       struct pm8001_device *pm8001_dev = dev->lldd_dev;
+       DECLARE_COMPLETION_ONSTACK(completion_setstate);
 
        for (retry = 0; retry < 3; retry++) {
                task = sas_alloc_slow_task(GFP_KERNEL);
@@ -729,6 +730,12 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev,
                        goto ex_err;
                }
                wait_for_completion(&task->slow_task->completion);
+               if (pm8001_ha->chip_id != chip_8001) {
+                       pm8001_dev->setds_completion = &completion_setstate;
+                               PM8001_CHIP_DISP->set_dev_state_req(pm8001_ha,
+                                       pm8001_dev, 0x01);
+                       wait_for_completion(&completion_setstate);
+               }
                res = -TMF_RESP_FUNC_FAILED;
                /* Even TMF timed out, return direct. */
                if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {