Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 118034
b: refs/heads/master
c: 6158d3a
h: refs/heads/master
v: v3
  • Loading branch information
Matthew Garrett authored and Linus Torvalds committed Oct 30, 2008
1 parent 0c6ec3b commit b1d3dec
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: def1be2d727a1764205479b3e3e3ba16ffbad028
refs/heads/master: 6158d3a2323835546c7cf83a170316fa77b726e0
6 changes: 4 additions & 2 deletions trunk/drivers/misc/sony-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -2315,8 +2315,10 @@ static int sony_pic_possible_resources(struct acpi_device *device)
*/
static int sony_pic_disable(struct acpi_device *device)
{
if (ACPI_FAILURE(acpi_evaluate_object(device->handle,
"_DIS", NULL, NULL)))
acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL,
NULL);

if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
return -ENXIO;

dprintk("Device disabled\n");
Expand Down

0 comments on commit b1d3dec

Please sign in to comment.