From ddd9357f6017a8c61a20685feab5ce9eee635f6c Mon Sep 17 00:00:00 2001 From: Lawrence Yiu Date: Mon, 21 Mar 2016 01:44:22 -0700 Subject: sony-laptop: Avoid oops on module unload for older laptops Older VAIO laptops without the SN00 ACPI method will have the "handles" variable unset. Return early from sony_nc_function_cleanup when "handles" is null. Signed-off-by: Lawrence Yiu Acked-by: Mattia Dongili Signed-off-by: Darren Hart --- drivers/platform/x86/sony-laptop.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/platform/x86/sony-laptop.c') diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index e9caa347a9bf..1dba3598cfcb 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -1446,6 +1446,9 @@ static void sony_nc_function_cleanup(struct platform_device *pd) { unsigned int i, result, bitmask, handle; + if (!handles) + return; + /* get enabled events and disable them */ sony_nc_int_call(sony_nc_acpi_handle, "SN01", NULL, &bitmask); sony_nc_int_call(sony_nc_acpi_handle, "SN03", &bitmask, &result); -- cgit