2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index d524dc245a2c..b40fb9b6c862 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -1814,7 +1814,7 @@ static int powerbook_sleep_grackle(void)
                 _set_L2CR(save_l2cr);
         
         /* Restore userland MMU context */
-        set_context(current->active_mm->context.id, current->active_mm->pgd);
+        switch_mmu_context(NULL, current->active_mm);
 
         /* Power things up */
         pmu_unlock();
@@ -1903,7 +1903,7 @@ powerbook_sleep_Core99(void)
                 _set_L3CR(save_l3cr);
         
         /* Restore userland MMU context */
-        set_context(current->active_mm->context.id, current->active_mm->pgd);
+        switch_mmu_context(NULL, current->active_mm);
 
         /* Tell PMU we are ready */
         pmu_unlock();
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index 7f2be4baaeda..7847e981ac33 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -87,11 +87,12 @@ struct smu_sdbp_header *smu_sat_get_sdb_partition(unsigned int sat_id, int id,
                 return NULL;
         }
 
-        len = i2c_smbus_read_word_data(&sat->i2c, 9);
-        if (len < 0) {
+        err = i2c_smbus_read_word_data(&sat->i2c, 9);
+        if (err < 0) {
                 printk(KERN_ERR "smu_sat_get_sdb_part rd len error\n");
                 return NULL;
         }
+        len = err;
         if (len == 0) {
                 printk(KERN_ERR "smu_sat_get_sdb_part no partition %x\n", id);
                 return NULL;