From 8f559e80985892d9bfd318f24e10024454fad3a7 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@suse.de>
Date: Sun, 23 Jan 2011 08:30:00 -0600
Subject: [PATCH] --- yaml --- r: 234977 b: refs/heads/master c:
 a29b5dad46ee4168c8fc18e47dabbde49790527b h: refs/heads/master i:   234975:
 c9d9bd1aa6e441b9be5307691635597d2b15558d v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/libata-scsi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d3adef77b9d1..d871ac568001 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 238c9cf9ea88bbbb9fd0f60c2cc9511c10b4585c
+refs/heads/master: a29b5dad46ee4168c8fc18e47dabbde49790527b
diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c
index e6ce765534ac..c11675f34b93 100644
--- a/trunk/drivers/ata/libata-scsi.c
+++ b/trunk/drivers/ata/libata-scsi.c
@@ -3759,7 +3759,7 @@ struct ata_port *ata_sas_port_alloc(struct ata_host *host,
 		return NULL;
 
 	ap->port_no = 0;
-	ap->lock = shost->host_lock;
+	ap->lock = &host->lock;
 	ap->pio_mask = port_info->pio_mask;
 	ap->mwdma_mask = port_info->mwdma_mask;
 	ap->udma_mask = port_info->udma_mask;