Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent

1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index c52f6e6e8af2..a373c18cf7b8 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -402,6 +402,11 @@ static const struct {
         },
         /* iPod mini */ {
                 .firmware_revision      = 0x0a2700,
+                .model_id               = 0x000022,
+                .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
+        },
+        /* iPod mini */ {
+                .firmware_revision      = 0x0a2700,
                 .model_id               = 0x000023,
                 .workarounds            = SBP2_WORKAROUND_FIX_CAPACITY,
         },
@@ -890,12 +895,13 @@ static void sbp2_host_reset(struct hpsb_host *host)
                 return;
 
         read_lock_irqsave(&sbp2_hi_logical_units_lock, flags);
+
         list_for_each_entry(lu, &hi->logical_units, lu_list)
-                if (likely(atomic_read(&lu->state) !=
-                           SBP2LU_STATE_IN_SHUTDOWN)) {
-                        atomic_set(&lu->state, SBP2LU_STATE_IN_RESET);
+                if (atomic_cmpxchg(&lu->state,
+                                   SBP2LU_STATE_RUNNING, SBP2LU_STATE_IN_RESET)
+                    == SBP2LU_STATE_RUNNING)
                         scsi_block_requests(lu->shost);
-                }
+
         read_unlock_irqrestore(&sbp2_hi_logical_units_lock, flags);
 }