From: Dylan Reid Date: Tue, 8 Apr 2014 19:06:18 +0000 (-0700) Subject: ALSA: hda - Use runtime helper to check active state. X-Git-Tag: firefly_0821_release~176^2~4090^2~6 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7b0a48f3402a43bd8bb85bfda4f72e0a34634d74;p=firefly-linux-kernel-4.4.55.git ALSA: hda - Use runtime helper to check active state. From azx_interrupt, use the helper to check if the device is active instead of checking the state. This will do the right thing if runtime pm is disabled in addition to if the device is suspended. Signed-off-by: Dylan Reid Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 3e005e509131..8197afc6cba5 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1759,7 +1759,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) #ifdef CONFIG_PM_RUNTIME if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME) - if (chip->card->dev->power.runtime_status != RPM_ACTIVE) + if (!pm_runtime_active(chip->card->dev)) return IRQ_NONE; #endif