From 9b8cc8d0b5851460dcc7a5605fefcf284102beb4 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 9 Jun 2012 13:18:14 +0900 Subject: [PATCH] --- yaml --- r: 311967 b: refs/heads/master c: 56f4a9f76d8ce7c7cef92905c909aad0c7e5c9db h: refs/heads/master i: 311965: 36c4fd355fd78549bbccefa79b277be2038fa881 311963: 796e1f5394e4ccbb29d94ba3c04a605afdb6339c 311959: cbadbb048abb389ecadc2d4589d224a486ab5816 311951: d01b427bda026f1c442b075ed5b26f9495c73d3f 311935: bea8eb2cba34517a128ba7c05f358a19722cb445 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/sony-laptop.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 280b779b81cc..a8ccf3eb8ea3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7a2918373983b32db3ca35823d930641747e26f +refs/heads/master: 56f4a9f76d8ce7c7cef92905c909aad0c7e5c9db diff --git a/trunk/drivers/platform/x86/sony-laptop.c b/trunk/drivers/platform/x86/sony-laptop.c index 78e6389d2cae..b9499b65c1cd 100644 --- a/trunk/drivers/platform/x86/sony-laptop.c +++ b/trunk/drivers/platform/x86/sony-laptop.c @@ -2139,7 +2139,7 @@ static ssize_t sony_nc_thermal_mode_show(struct device *dev, struct device_attribute *attr, char *buffer) { ssize_t count = 0; - unsigned int mode = sony_nc_thermal_mode_get(); + int mode = sony_nc_thermal_mode_get(); if (mode < 0) return mode; @@ -2507,8 +2507,6 @@ static void sony_nc_backlight_ng_read_limits(int handle, props->maxlvl = 0xff; offset = sony_find_snc_handle(handle); - if (offset < 0) - return; /* try to read the boundaries from ACPI tables, if we fail the above * defaults should be reasonable