diff --git a/[refs] b/[refs] index 03b03fe5432e..0d8f661f9aeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3766054fff4af1b58a1440a284907887f4d2e8be +refs/heads/master: 24237c43aade30758aacabbf0e462fca19c48231 diff --git a/trunk/drivers/platform/x86/acer-wmi.c b/trunk/drivers/platform/x86/acer-wmi.c index 377d92d8d9b1..cdee5ecf4bf6 100644 --- a/trunk/drivers/platform/x86/acer-wmi.c +++ b/trunk/drivers/platform/x86/acer-wmi.c @@ -1833,7 +1833,7 @@ static int __init acer_wmi_get_handle(const char *name, const char *prop, BUG_ON(!name || !ah); - handle = 0; + handle = NULL; status = acpi_get_devices(prop, acer_wmi_get_handle_cb, (void *)name, &handle);