Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 311967
b: refs/heads/master
c: 56f4a9f
h: refs/heads/master
i:
  311965: 36c4fd3
  311963: 796e1f5
  311959: cbadbb0
  311951: d01b427
  311935: bea8eb2
v: v3
  • Loading branch information
Dan Carpenter authored and Matthew Garrett committed Jun 26, 2012
1 parent fb6eceb commit 9b8cc8d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c7a2918373983b32db3ca35823d930641747e26f
refs/heads/master: 56f4a9f76d8ce7c7cef92905c909aad0c7e5c9db
4 changes: 1 addition & 3 deletions trunk/drivers/platform/x86/sony-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9b8cc8d

Please sign in to comment.