summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-08-10 13:11:18 +0900
committerMatthew Garrett <matthew.garrett@nebula.com>2013-08-18 13:23:09 -0400
commit03a174b35cb6064cd670428f8ea811fc2736a3a6 (patch)
tree79da2c54ccbe78de5dc4f6bd0dfcfbbd56c338db /drivers/platform/x86
parent50e37ccea06ca8846ceb60dbfbe056012c60d71b (diff)
downloadlinux-03a174b35cb6064cd670428f8ea811fc2736a3a6.tar.bz2
sony-laptop: return a negative error code in sonypi_compat_init()
Return -1 in the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/sony-laptop.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 2ac045f27f10..b1627335ff00 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -4320,7 +4320,8 @@ static int sony_pic_add(struct acpi_device *device)
goto err_free_resources;
}
- if (sonypi_compat_init())
+ result = sonypi_compat_init();
+ if (result)
goto err_remove_input;
/* request io port */