From ff9ab47a1dadc602a9e2d256625718915b87405a Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 31 Jan 2013 09:26:13 +0000 Subject: [PATCH] --- yaml --- r: 359780 b: refs/heads/master c: e6e053f4e47634c07993cb31893556d24e18b65e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/thermal/rcar_thermal.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cffa4e7f6dfb..4d794c747701 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0a5172e9eec7f0d3c476e013c51dab62f3fc666 +refs/heads/master: e6e053f4e47634c07993cb31893556d24e18b65e diff --git a/trunk/drivers/thermal/rcar_thermal.c b/trunk/drivers/thermal/rcar_thermal.c index 80aae3cf65eb..2eebcadb4c99 100644 --- a/trunk/drivers/thermal/rcar_thermal.c +++ b/trunk/drivers/thermal/rcar_thermal.c @@ -261,7 +261,6 @@ static int rcar_thermal_notify(struct thermal_zone_device *zone, case THERMAL_TRIP_CRITICAL: /* FIXME */ dev_warn(dev, "Thermal reached to critical temperature\n"); - machine_power_off(); break; default: break;