diff options
Diffstat (limited to 'drivers/scsi/libsas/sas_phy.c')
-rw-r--r-- | drivers/scsi/libsas/sas_phy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c index 2455199e5ffc..4ca4b1f30bd0 100644 --- a/drivers/scsi/libsas/sas_phy.c +++ b/drivers/scsi/libsas/sas_phy.c | |||
@@ -19,7 +19,6 @@ static void sas_phye_loss_of_signal(struct work_struct *work) | |||
19 | struct asd_sas_event *ev = to_asd_sas_event(work); | 19 | struct asd_sas_event *ev = to_asd_sas_event(work); |
20 | struct asd_sas_phy *phy = ev->phy; | 20 | struct asd_sas_phy *phy = ev->phy; |
21 | 21 | ||
22 | phy->in_shutdown = 0; | ||
23 | phy->error = 0; | 22 | phy->error = 0; |
24 | sas_deform_port(phy, 1); | 23 | sas_deform_port(phy, 1); |
25 | } | 24 | } |
@@ -29,7 +28,6 @@ static void sas_phye_oob_done(struct work_struct *work) | |||
29 | struct asd_sas_event *ev = to_asd_sas_event(work); | 28 | struct asd_sas_event *ev = to_asd_sas_event(work); |
30 | struct asd_sas_phy *phy = ev->phy; | 29 | struct asd_sas_phy *phy = ev->phy; |
31 | 30 | ||
32 | phy->in_shutdown = 0; | ||
33 | phy->error = 0; | 31 | phy->error = 0; |
34 | } | 32 | } |
35 | 33 | ||
@@ -110,6 +108,7 @@ static void sas_phye_shutdown(struct work_struct *work) | |||
110 | ret); | 108 | ret); |
111 | } else | 109 | } else |
112 | pr_notice("phy%d is not enabled, cannot shutdown\n", phy->id); | 110 | pr_notice("phy%d is not enabled, cannot shutdown\n", phy->id); |
111 | phy->in_shutdown = 0; | ||
113 | } | 112 | } |
114 | 113 | ||
115 | /* ---------- Phy class registration ---------- */ | 114 | /* ---------- Phy class registration ---------- */ |