---

yaml --- r: 254410 b: refs/heads/master c: d857d9a h: refs/heads/master v: v3
git-mirror · Jul 3, 2011 · 13b1ac3 · 13b1ac3
1 parent 40c2ebf
commit 13b1ac3
Show file tree

Hide file tree

Showing 7 changed files with 261 additions and 413 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41e2b90584695cf5ae3a29eaa115e31913fbefe0
+refs/heads/master: d857d9a0adf49e332413d918322405192aafc766
diff --git a/trunk/drivers/scsi/isci/core/sci_base_phy.h b/trunk/drivers/scsi/isci/core/sci_base_phy.h
diff --git a/trunk/drivers/scsi/isci/core/scic_sds_controller.c b/trunk/drivers/scsi/isci/core/scic_sds_controller.c
@@ -679,7 +679,7 @@ static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_contro
 
 		for (index = 0; index < SCI_MAX_PHYS; index++) {
 			sci_phy = &scic->phy_table[index];
-			state = sci_phy->parent.state_machine.current_state_id;
+			state = sci_phy->state_machine.current_state_id;
 
 			if (!scic_sds_phy_get_port(sci_phy))
 				continue;