lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 'staging-next' to Linus's tree

Browse Source 
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2010-10-28 09:44:56 -07:00
parent 81280572ca a4ac0d847a
commit e4c5bf8e3d
1365 changed files with 420044 additions and 147476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -397,16 +397,15 @@ static int __init quickstart_init_input(void)
static int __init quickstart_init(void)
{
int ret;
acpi_status status = 0;
/* ACPI Check */
if (acpi_disabled)
return -ENODEV;
/* ACPI driver register */
status = acpi_bus_register_driver(&quickstart_acpi_driver);
if (status < 0)
return -ENODEV;
ret = acpi_bus_register_driver(&quickstart_acpi_driver);
if (ret)
return ret;
/* If existing bus with no devices */
if (!quickstart_data.btn_lst) {