diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/quickstart/quickstart.c | |
| parent | Merge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. (diff) | |
| download | linux-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz linux-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip | |
Merge 'staging-next' to Linus's tree
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>
Diffstat (limited to 'drivers/staging/quickstart/quickstart.c')
| -rw-r--r-- | drivers/staging/quickstart/quickstart.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c index ba8f670ec0a7..d746715d3d89 100644 --- a/drivers/staging/quickstart/quickstart.c +++ b/drivers/staging/quickstart/quickstart.c @@ -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) { |