Merge with /home/shaggy/git/linus-clean/

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 3838f88e1fe0..4772fb317f3e 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2659,6 +2659,8 @@ int fas216_eh_host_reset(Scsi_Cmnd *SCpnt)
 {
         FAS216_Info *info = (FAS216_Info *)SCpnt->device->host->hostdata;
 
+        spin_lock_irq(info->host->host_lock);
+
         fas216_checkmagic(info);
 
         printk("scsi%d.%c: %s: resetting host\n",
@@ -2686,6 +2688,7 @@ int fas216_eh_host_reset(Scsi_Cmnd *SCpnt)
 
         fas216_init_chip(info);
 
+        spin_unlock_irq(info->host->host_lock);
         return SUCCESS;
 }