diff options
author | Len Brown <len.brown@intel.com> | 2007-03-09 23:19:50 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-03-09 23:19:50 -0500 |
commit | 63e34ca93a62f472144db60fa3b81111c0d15721 (patch) | |
tree | 2137a4b98360833e78cbb8edd5dce5b2ab5a0a60 /drivers/misc/sony-laptop.c | |
parent | 51e7fff1c2b763da910db3a875eac5b992df91d9 (diff) | |
parent | 9327f46ee28116b17f15f6505edd90f905908d62 (diff) |
Pull misc-for-upstream into release branch
Diffstat (limited to 'drivers/misc/sony-laptop.c')
-rw-r--r-- | drivers/misc/sony-laptop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 2ebe240dd53..ac708bc2f9f 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c @@ -453,7 +453,7 @@ static int sony_acpi_resume(struct acpi_device *device) static int sony_acpi_add(struct acpi_device *device) { acpi_status status; - int result; + int result = 0; acpi_handle handle; sony_acpi_acpi_device = device; |