Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (346 commits) ASoC: core: Don't set "(null)" as a driver name ALSA: hda - Use LPIB for ATI/AMD chipsets as default Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets" ASoC: Tegra: Fix compile when debugfs not enabled ASoC: spdif-dit: Add missing MODULE_* SOUND: OSS: Remove Au1550 driver. ALSA: hda - add Intel Panther Point HDMI codec id ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live! ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek ALSA: hda - Fix input-src parse in patch_analog.c ASoC: davinci-mcasp: enable ping-pong SRAM buffers ASoC: add iPAQ hx4700 machine driver ASoC: Asahi Kasei AK4641 codec driver ALSA: hda - Enable Realtek ALC269 codec input layer beep ALSA: intel8x0m: enable AMD8111 modem ALSA: HDA: Add jack detection for HDMI ALSA: sound, core, pcm_lib: fix xrun_log ASoC: Max98095: Move existing NULL check before pointer dereference. ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt ALSA: usb-audio - Add support for USB X-Fi S51 Pro ...
This commit is contained in:
@@ -31,6 +31,7 @@ int fw_iso_resources_init(struct fw_iso_resources *r, struct fw_unit *unit)
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_init);
|
||||
|
||||
/**
|
||||
* fw_iso_resources_destroy - destroy a resource manager
|
||||
@@ -42,6 +43,7 @@ void fw_iso_resources_destroy(struct fw_iso_resources *r)
|
||||
mutex_destroy(&r->mutex);
|
||||
fw_unit_put(r->unit);
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_destroy);
|
||||
|
||||
static unsigned int packet_bandwidth(unsigned int max_payload_bytes, int speed)
|
||||
{
|
||||
@@ -146,6 +148,7 @@ retry_after_bus_reset:
|
||||
|
||||
return channel;
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_allocate);
|
||||
|
||||
/**
|
||||
* fw_iso_resources_update - update resource allocations after a bus reset
|
||||
@@ -197,6 +200,7 @@ int fw_iso_resources_update(struct fw_iso_resources *r)
|
||||
|
||||
return channel;
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_update);
|
||||
|
||||
/**
|
||||
* fw_iso_resources_free - frees allocated resources
|
||||
@@ -224,3 +228,4 @@ void fw_iso_resources_free(struct fw_iso_resources *r)
|
||||
|
||||
mutex_unlock(&r->mutex);
|
||||
}
|
||||
EXPORT_SYMBOL(fw_iso_resources_free);
|
||||
|
Reference in New Issue
Block a user