Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 243118
b: refs/heads/master
c: 7227ded
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and Matthew Garrett committed Mar 28, 2011
1 parent aa776f1 commit e740930
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: f11113b22cd84b0adc355eaaa80be433005f5f45
refs/heads/master: 7227dedbc22f66f1bd310c866053b08de0496e38
6 changes: 4 additions & 2 deletions trunk/drivers/platform/x86/sony-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -1594,9 +1594,11 @@ static int sony_nc_add(struct acpi_device *device)
if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "SN00",
&handle))) {
dprintk("Doing SNC setup\n");
if (sony_nc_handles_setup(sony_pf_device))
result = sony_nc_handles_setup(sony_pf_device);
if (result)
goto outpresent;
if (sony_nc_kbd_backlight_setup(sony_pf_device))
result = sony_nc_kbd_backlight_setup(sony_pf_device);
if (result)
goto outsnc;
sony_nc_function_setup(device);
sony_nc_rfkill_setup(device);
Expand Down

0 comments on commit e740930

Please sign in to comment.