diff --git a/[refs] b/[refs] index 14b806cff69b..7020c3969a91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84a9a8cd9d0aa93c17e5815ab8a9cc4c0a765c63 +refs/heads/master: 53637e0760d56274177be7e6d630490bc49766c1 diff --git a/trunk/drivers/ata/libata-zpodd.c b/trunk/drivers/ata/libata-zpodd.c index a7df60383532..90b159b740b3 100644 --- a/trunk/drivers/ata/libata-zpodd.c +++ b/trunk/drivers/ata/libata-zpodd.c @@ -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); }