Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound build error fix from Takashi Iwai:
"Only a single commit for fixing the build error without CONFIG_PM in
hda driver."
* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix build without CONFIG_PM
+4
-2
+4
-2
sound/pci/hda/hda_codec.c
+4
-2
sound/pci/hda/hda_codec.c
···
95
95
EXPORT_SYMBOL_HDA(snd_hda_delete_codec_preset);
96
96
97
97
#ifdef CONFIG_PM
98
+
#define codec_in_pm(codec) ((codec)->in_pm)
98
99
static void hda_power_work(struct work_struct *work);
99
100
static void hda_keep_power_on(struct hda_codec *codec);
100
101
#define hda_codec_is_power_on(codec) ((codec)->power_on)
···
105
104
bus->ops.pm_notify(bus, power_up);
106
105
}
107
106
#else
107
+
#define codec_in_pm(codec) 0
108
108
static inline void hda_keep_power_on(struct hda_codec *codec) {}
109
109
#define hda_codec_is_power_on(codec) 1
110
110
#define hda_call_pm_notify(bus, state) {}
···
230
228
}
231
229
mutex_unlock(&bus->cmd_mutex);
232
230
snd_hda_power_down(codec);
233
-
if (!codec->in_pm && res && *res == -1 && bus->rirb_error) {
231
+
if (!codec_in_pm(codec) && res && *res == -1 && bus->rirb_error) {
234
232
if (bus->response_reset) {
235
233
snd_printd("hda_codec: resetting BUS due to "
236
234
"fatal communication error\n");
···
240
238
goto again;
241
239
}
242
240
/* clear reset-flag when the communication gets recovered */
243
-
if (!err || codec->in_pm)
241
+
if (!err || codec_in_pm(codec))
244
242
bus->response_reset = 0;
245
243
return err;
246
244
}