Pull acpi_os_free into release branch
This commit is contained in:
@ -319,7 +319,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
|
||||
goto end;
|
||||
}
|
||||
|
||||
acpi_os_free(buffer.pointer);
|
||||
kfree(buffer.pointer);
|
||||
|
||||
device->wakeup.flags.valid = 1;
|
||||
/* Power button, Lid switch always enable wakeup */
|
||||
@ -854,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device,
|
||||
printk(KERN_ERR "Memory allocation error\n");
|
||||
}
|
||||
|
||||
acpi_os_free(buffer.pointer);
|
||||
kfree(buffer.pointer);
|
||||
}
|
||||
|
||||
static int acpi_device_set_context(struct acpi_device *device, int type)
|
||||
|
Reference in New Issue
Block a user