Merge branch 'master' into next

4 files changed, 8 insertions, 6 deletions

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index a0f68386c12f..588a5b0bc4b5 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -294,10 +294,11 @@ static void macio_setup_interrupts(struct macio_dev *dev)
         int i = 0, j = 0;
 
         for (;;) {
-                struct resource *res = &dev->interrupt[j];
+                struct resource *res;
 
                 if (j >= MACIO_DEV_COUNT_IRQS)
                         break;
+                res = &dev->interrupt[j];
                 irq = irq_of_parse_and_map(np, i++);
                 if (irq == NO_IRQ)
                         break;
@@ -321,9 +322,10 @@ static void macio_setup_resources(struct macio_dev *dev,
         int index;
 
         for (index = 0; of_address_to_resource(np, index, &r) == 0; index++) {
-                struct resource *res = &dev->resource[index];
+                struct resource *res;
                 if (index >= MACIO_DEV_COUNT_RESOURCES)
                         break;
+                res = &dev->resource[index];
                 *res = r;
                 res->name = dev_name(&dev->ofdev.dev);
 
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index a98ab72adf95..93fb32038b14 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -274,7 +274,7 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
 
                 if (cpu > 1)
                         continue;
-                rcpu = &rm->cpu[cpu];;
+                rcpu = &rm->cpu[cpu];
                 rcpu->prev_idle = get_cpu_idle_time(cpu);
                 rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64());
                 schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer,
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 40023313a760..8b9364434aa0 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -239,8 +239,8 @@ setup_hardware( void )
          * to be on the safe side (OSX doesn't)...
          */
         if( x.overheat_temp == (80 << 8) ) {
-                x.overheat_temp = 65 << 8;
-                x.overheat_hyst = 60 << 8;
+                x.overheat_temp = 75 << 8;
+                x.overheat_hyst = 70 << 8;
                 write_reg( x.thermostat, 2, x.overheat_hyst, 2 );
                 write_reg( x.thermostat, 3, x.overheat_temp, 2 );
 
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index 55ad95671387..d242976bcfe7 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -72,7 +72,7 @@ static void pmu_led_set(struct led_classdev *led_cdev,
 }
 
 static struct led_classdev pmu_led = {
-        .name = "pmu-front-led",
+        .name = "pmu-led::front",
 #ifdef CONFIG_ADB_PMU_LED_IDE
         .default_trigger = "ide-disk",
 #endif