Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219680
b: refs/heads/master
c: f090386
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Aug 31, 2010
1 parent 98a1931 commit 6b5559d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0b6e7220ed2be6e40bbda4eeb2b9c397008f2cef
refs/heads/master: f0903863099668d6b03c7ea90b2e58a7ad1be6a3
7 changes: 3 additions & 4 deletions trunk/drivers/staging/quickstart/quickstart.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,16 +398,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) {
Expand Down

0 comments on commit 6b5559d

Please sign in to comment.