UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Szymon Janc 2012-01-11 23:22:43 +01:00 committed by Greg Kroah-Hartman
parent f27a551968
commit ffe1c0565c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/quickstart/quickstart.c
View File

@ -240,21 +240,24 @@ static int quickstart_acpi_ghid(struct quickstart_acpi *quickstart)
return ret; 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; int ret;
name = kmalloc(strlen(bid) + 1, GFP_KERNEL);
if (!name)
return -ENOMEM;
/* Add button to list */ /* Add button to list */
ret = quickstart_btnlst_add(&quickstart->btn); ret = quickstart_btnlst_add(&quickstart->btn);
if (ret) if (ret < 0) {
kfree(name);
return ret; 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); strcpy(quickstart->btn->name, bid);
return 0; return 0;
@ -280,7 +283,7 @@ static int quickstart_acpi_add(struct acpi_device *device)
device->driver_data = quickstart; device->driver_data = quickstart;
/* Add button to list and initialize some stuff */ /* 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) if (ret < 0)
goto fail_config; goto fail_config;