mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Staging: quickstart: Cleanup quickstart_acpi_config
Signed-off-by: Szymon Janc <szymon@janc.net.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f27a551968
commit
ffe1c0565c
1 changed files with 12 additions and 9 deletions
|
@ -240,21 +240,24 @@ static int quickstart_acpi_ghid(struct quickstart_acpi *quickstart)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int quickstart_acpi_config(struct quickstart_acpi *quickstart, char *bid)
|
||||
static int quickstart_acpi_config(struct quickstart_acpi *quickstart)
|
||||
{
|
||||
int len = strlen(bid);
|
||||
char *bid = acpi_device_bid(quickstart->device);
|
||||
char *name;
|
||||
int ret;
|
||||
|
||||
name = kmalloc(strlen(bid) + 1, GFP_KERNEL);
|
||||
if (!name)
|
||||
return -ENOMEM;
|
||||
|
||||
/* Add button to list */
|
||||
ret = quickstart_btnlst_add(&quickstart->btn);
|
||||
if (ret)
|
||||
if (ret < 0) {
|
||||
kfree(name);
|
||||
return ret;
|
||||
|
||||
quickstart->btn->name = kzalloc(len + 1, GFP_KERNEL);
|
||||
if (!quickstart->btn->name) {
|
||||
quickstart_btnlst_free();
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
quickstart->btn->name = name;
|
||||
strcpy(quickstart->btn->name, bid);
|
||||
|
||||
return 0;
|
||||
|
@ -280,7 +283,7 @@ static int quickstart_acpi_add(struct acpi_device *device)
|
|||
device->driver_data = quickstart;
|
||||
|
||||
/* Add button to list and initialize some stuff */
|
||||
ret = quickstart_acpi_config(quickstart, acpi_device_bid(device));
|
||||
ret = quickstart_acpi_config(quickstart);
|
||||
if (ret < 0)
|
||||
goto fail_config;
|
||||
|
||||
|
|
Loading…
Reference in a new issue