summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'topic/misc' into for-linusTakashi Iwai2012-01-12172-913/+2775
|\
| * ALSA: usb-audio: add Yamaha MOX6/MOX8 supportClemens Ladisch2012-01-111-0/+26
| | | | | | | | | | Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: virtuoso: add S/PDIF input support for all XonarsClemens Ladisch2012-01-113-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | All Xonar cards support S/PDIF input, but the cards without optical or coaxial plugs have only undocumented pin connectors. Support for the ST/STX was already added in a previous patch; this adds support for the D1/DX (JP2), DG (J5), DS (J5), and HDAV Slim (J12). Many thanks to Zoltan Miklos for testing the DS and DX. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: ice1724 - Support for ooAoo SQ210aPavel Hofman2012-01-111-0/+35
| | | | | | | | | | | | | | | | | | This card shares PCI ids with Chaintec AV710. Therefore, it will not be detected automatically, it can only be activated by the module parameter model=sq210a. Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: ice1724 - Allow card info based on model onlyPavel Hofman2012-01-111-3/+5
| | | | | | | | | | | | | | | | | | When two different cards share the same PCI vendor/subvendor identification, allow card info based on model only. Do not require subvendor ID. Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: ice1724 - Create capture pcm only for ADC-enabled configurationsPavel Hofman2012-01-112-3/+11
| | | | | | | | | | | | | | | | Add the capture pcm only if there is at least one ADC configured in the SYSCONF register. Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hdspm - Provide unique driver id based on card serialAdrian Knoth2012-01-111-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, /proc/asound looked like this: 2 [Default ]: HDSPM - RME RayDAT_f1cd85 RME RayDAT S/N 0xf1cd85 at 0xf7300000, irq 18 In case of a second HDSPM card, its name would be Default_1. This is cumbersome, because the order of the cards isn't stable across reboots. To help userspace tools referring to the correct card, this commit provides a unique id for each card: 2 [HDSPMxf1cd85 ]: HDSPM - RME RayDAT_f1cd85 RME RayDAT S/N 0xf1cd85 at 0xf7300000, irq 18 In this example, userspace (configuration files) would then use hw:HDSPMxf1cd85 to choose the right card. The serial is masked to 24bits, so this string is always shorter than sixteen chars. Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()Takashi Iwai2012-01-091-0/+3
| | | | | | | | | | | | | | | | | | Dan Carpenter reported that setting 0 to uinfo->value.enumerated.items in snd_asihpi_cmode_info() may lead to Oops. This function should return an error immediately in such a case instead. Cc: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()Takashi Iwai2012-01-091-2/+1
| | | | | | | | | | | | | | | | | | Dan Carpenter reported that setting 0 to uinfo->value.enumerated.items in snd_hdsp_info_pref_sync_ref() may lead to Oops. This function should return an error immediately in such a case instead. Cc: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: usb-audio - Avoid flood of frame-active debug messagesTakashi Iwai2012-01-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | With some buggy devices, the usb-audio driver may give "frame xxx active" kernel messages too often. Better to keep it as debug-only using snd_printdd(), and also add the rate-limit for avoiding floods. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=738681 Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: snd-usb-us122l: Delete calls to preempt_disableKarsten Wiese2012-01-091-4/+2
| | | | | | | | | | | | | | | | They are not needed here. Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de> Cc: stable@kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hdspm - Refactor serial number to avoid code duplicationAdrian Knoth2012-01-081-5/+8
| | | | | | | | | | | | | | | | | | The serial number is used multiple times in hdspm.c. Since it belongs to the card, let's store it in struct hdspm and refer to it whenever necessary. Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: usb-audio: fix possible hang and overflow in ↵Xi Wang2012-01-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parse_uac2_sample_rate_range() A malicious USB device may feed in carefully crafted min/max/res values, so that the inner loop in parse_uac2_sample_rate_range() could run for a long time or even never terminate, e.g., given max = INT_MAX. Also nr_rates could be a large integer, which causes an integer overflow in the subsequent call to kmalloc() in parse_audio_format_rates_v2(). Thus, kmalloc() would allocate a smaller buffer than expected, leading to a memory corruption. To exploit the two vulnerabilities, an attacker needs physical access to the machine to plug in a malicious USB device. This patch makes two changes. 1) The type of "rate" is changed to unsigned int, so that the loop could stop once "rate" is larger than INT_MAX. 2) Limit nr_rates to 1024. Suggested-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: Au88x0 - Fix channels swapping of 4 channels playbackRaymond Yau2012-01-082-4/+1
| | | | | | | | | | | | | | | | | | Fix channels swapping of 4 channels playback by using vortex_adbdma_stopfifo instead of vortex_adbdma_pausefifo for SNDRV_PCM_TRIGGER_STOP event Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: Au88x0 - Fix IRQ fifo error and channels swap of 4 channels playbackRaymond Yau2012-01-082-6/+6
| | | | | | | | | | | | | | | | Fix IRQ fifo error when playing stereo by set stereo flag of fifo control. This also fix the swap of front and rear channels on au8830. Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: Au88x0 - Fix Xtalk's constantsRaymond Yau2012-01-081-31/+56
| | | | | | | | | | | | | | | | | | - Fix XtalkGainsDefault, XtalkGains1Chn - Fix XtalkWideCoefsLeftEQ, XtalkWideCoefsRightEQ - Fix XtlakWideCoefsLeftXT, XtalkWideCoefsRightXT Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: Au88x0 - Xtalk - fix write/read of eq and xt instatesRaymond Yau2012-01-081-32/+32
| | | | | | | | | | Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: ice1724 - External clock item only for cards with SPDIF_INPavel Hofman2012-01-081-1/+6
| | | | | | | | | | | | | | | | Append the external clock item to the clock list only if the SPDIF_IN capability is defined in the SPDIF register. Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: ice1724 - Check for ac97 to avoid kernel oopsPavel Hofman2012-01-081-2/+5
| | | | | | | | | | | | | | | | | | Cards with identical PCI ids but no AC97 config in EEPROM do not have the ac97 field initialized. We must check for this case to avoid kernel oops. Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: emu10k1 - add another Audigy 2 ZS IDTim Yamin2011-12-311-0/+12
| | | | | | | | | | | | | | 0x20051102 is an Audigy 2 ZS. Signed-off-by: Tim Yamin <plasm@roo.me.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: export compress headersVinod Koul2011-12-311-0/+2
| | | | | | | | | | | | | | Export compress_offload.h and compress_params.h for userland to use Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: core: add makefile and kconfig file for compressVinod Koul2011-12-232-0/+14
| | | | | | | | | | | | Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: core: add support for compress_offloadVinod Koul2011-12-231-0/+765
| | | | | | | | | | | | | | | | | | This patch adds core.c, the file which implements the ioctls and registers the devices Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: core: add API header and driver header filesVinod Koul2011-12-232-0/+328
| | | | | | | | | | | | | | | | | | This patch adds the header files for ioctl definitions and header file for driver APIs for lower level device drivers to use Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: core: add compress parameter definationsVinod Koul2011-12-231-0/+397
| | | | | | | | | | | | | | | | | | | | The patch adds the various definations used to define the encoder and decoder parameters Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: core: add support for compressed devicesOmair Mohammed Abdullah2011-12-233-1/+5
| | | | | | | | | | | | | | | | | | | | | | Use the minor numbers 2 and 3 for audio compressed offload devices. Also add support for these devices in core Signed-off-by: Omair Mohammed Abdullah <omair.m.abdullah@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: compress offload API documentationPierre-Louis Bossart2011-12-231-0/+188
| | | | | | | | | | | | | | | | The patch adds the documentation file explaining the API Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Fix format validity check.Eliot Blennerhassett2011-12-221-36/+33
| | | | | | | | | | | | | | | | | | Sharing and not reinitialising static pcm_hardware struct resulted in stream format validity flags being incorrectly shared between cards. Fix and clarify by declaring locally and initialising in the open functions. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Use valid channel count in format enumeration.Eliot Blennerhassett2011-12-221-12/+8
| | | | | | | | | | | | | | | | Since introduction of mono and low latency modes, fixed channel count of 2 is not always valid. Use reported max_channels instead. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Correct headers in cached control responses.Eliot Blennerhassett2011-12-221-1/+7
| | | | | | | | | | | | | | | | Previously, only payload and size were correct, sufficient for reading, but other fields produced spurious debug output. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Add HPI version to module description.Eliot Blennerhassett2011-12-221-1/+3
| | | | | | | | | | | | | | | | It is useful to know the HPI version without having to load the module, in order to determine the matching firmware version. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Distinguish four different emif init errors.Eliot Blennerhassett2011-12-221-16/+19
| | | | | | | | | | Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - New defs and comments.Eliot Blennerhassett2011-12-221-14/+34
| | | | | | | | | | | | | | | | Add new error codes, and adapter properties. Clean up some comments. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Add autofade query.Eliot Blennerhassett2011-12-222-0/+13
| | | | | | | | | | Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Simplify dsp code close.Eliot Blennerhassett2011-12-221-5/+2
| | | | | | | | | | | | | | | | dsp_code struct is not created if firmware is invalid, so check and zero of firmware pointer is not necessary Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Remove redundant struct members.Eliot Blennerhassett2011-12-227-170/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | Structs hpi_adapter and snd_card_asihpi had members that duplicate those in underlying hpi_adapter_obj or whose info can be retrieved using hpi_adapter_get_info(). Print less info in probe function, it can be retrieved from /proc. Avoid name redundancy: hpi_adapter_obj.adapter_type renamed to .type Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Increase debug response buffer size.Eliot Blennerhassett2011-12-221-1/+1
| | | | | | | | | | | | | | Enables retrieving more debug info in fewer transactions. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Add new function codes.Eliot Blennerhassett2011-12-221-3/+10
| | | | | | | | | | Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Remove unused structs and defsEliot Blennerhassett2011-12-221-94/+2
| | | | | | | | | | | | | | Structs related to network flash update are not required in kernel. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Update node types.Eliot Blennerhassett2011-12-222-5/+3
| | | | | | | | | | | | | | | | Add "Internal" node type. Remove GPI and GPO node types. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Only set sync if card supports hardware stream grouping.Eliot Blennerhassett2011-12-221-3/+3
| | | | | | | | | | Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Relax drained check for more reliable playback startup.Eliot Blennerhassett2011-12-221-3/+2
| | | | | | | | | | Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Correct stray capital letters in identifier.Eliot Blennerhassett2011-12-222-8/+8
| | | | | | | | | | Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Use snd_pcm_debug_name to get substream name.Eliot Blennerhassett2011-12-221-2/+6
| | | | | | | | | | Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Volumes and meters may have 1 or 2 channels.Eliot Blennerhassett2011-12-221-2/+14
| | | | | | | | | | | | | | The channel count can be queried to determine which. Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Low latency mode stream has fixed channel count.Eliot Blennerhassett2011-12-221-4/+13
| | | | | | | | | | | | | | Unlike other streams which support 1..max channels, Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Update copyright to 2011Eliot Blennerhassett2011-12-2214-14/+14
| | | | | | | | | | Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - Split hpi version info into separate header file.Eliot Blennerhassett2011-12-226-34/+47
| | | | | | | | | | | | | | and update HPI version to 4.10 Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: asihpi - fix pcm dma pointer trackingEliot Blennerhassett2011-12-221-2/+2
| | | | | | | | | | | | | | | | Elapsed counter should only count data committed to snd_pcm_period_elapsed, rather than all data available Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: Add missing module parameters for als300 and cs5530 driversTakashi Iwai2011-12-192-2/+16
| | | | | | | | | | | | | | These drviers defined only variables but didn't declare as module parameters. Also fix the enable variable to bool type. Signed-off-by: Takashi Iwai <tiwai@suse.de>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-30 22:39:53 +0000