Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 356965
b: refs/heads/master
c: 53637e0
h: refs/heads/master
i:
  356963: 3abb9e9
v: v3
  • Loading branch information
Aaron Lu authored and Jeff Garzik committed Feb 20, 2013
1 parent 6e15cce commit 7374168
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 84a9a8cd9d0aa93c17e5815ab8a9cc4c0a765c63
refs/heads/master: 53637e0760d56274177be7e6d630490bc49766c1
3 changes: 1 addition & 2 deletions trunk/drivers/ata/libata-zpodd.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,7 @@ static void zpodd_wake_dev(acpi_handle handle, u32 event, void *context)
struct zpodd *zpodd = ata_dev->zpodd;
struct device *dev = &ata_dev->sdev->sdev_gendev;

if (event == ACPI_NOTIFY_DEVICE_WAKE && ata_dev &&
pm_runtime_suspended(dev)) {
if (event == ACPI_NOTIFY_DEVICE_WAKE && pm_runtime_suspended(dev)) {
zpodd->from_notify = true;
pm_runtime_resume(dev);
}
Expand Down

0 comments on commit 7374168

Please sign in to comment.