diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-14 07:56:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-14 07:56:29 +0200 |
| commit | e9ff1e42033176489c047157b3878654bf96d185 (patch) | |
| tree | d9554a1780e368a9b7b6d6097d8331238b43ece3 | |
| parent | 311b006751bde3ad1f5e835895b589ed764f6975 (diff) | |
| parent | 6dc581c9055be0c19a03a433a60eb858fcbbb040 (diff) | |
| download | alsa-driver-build-unstable-e9ff1e42033176489c047157b3878654bf96d185.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/pci/hda/hda_codec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/alsa/pci/hda/hda_codec.c b/alsa/pci/hda/hda_codec.c index c122956e2..780739960 100644 --- a/alsa/pci/hda/hda_codec.c +++ b/alsa/pci/hda/hda_codec.c @@ -1,5 +1,5 @@ #include "adriver.h" -#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 15, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) #include <linux/device.h> static int pm_runtime_force_suspend(struct device *dev); static int pm_runtime_force_resume(struct device *dev); @@ -15,12 +15,12 @@ static int pm_runtime_force_suspend(struct device *dev) if (pm_runtime_status_suspended(dev)) return 0; - if (!device->driver->pm || !device->driver->pm->runtime_suspend) { + if (!dev->driver->pm || !dev->driver->pm->runtime_suspend) { ret = -ENOSYS; goto err; } - ret = device->driver->pm->runtime_suspend(dev); + ret = dev->driver->pm->runtime_suspend(dev); if (ret) goto err; @@ -35,12 +35,12 @@ static int pm_runtime_force_resume(struct device *dev) { int ret = 0; - if (!device->driver->pm || !device->driver->pm->runtime_resume) { + if (!dev->driver->pm || !dev->driver->pm->runtime_resume) { ret = -ENOSYS; goto out; } - ret = device->driver->pm->runtime_resume(dev); + ret = dev->driver->pm->runtime_resume(dev); if (ret) goto out; |