21 Aug, 2012
1 commit
-
snd_card_als100_probe() does not set pcm field in struct snd_sb.
As a result, PCM is not suspended and applications don't know that they need
to resume the playback.Tested with Labway A381-F20 card (ALS120).
Signed-off-by: Ondrej Zary
Signed-off-by: Takashi Iwai
30 Jul, 2012
1 commit
-
This will fix the following oops:
[ 6.169981] genirq: Flags mismatch irq 5. 00000000 (ES1688) vs. 00000000 (ES1688)
[ 6.170851] Pid: 1, comm: swapper Not tainted 3.5.0-00004-gceee0e9 #14
[ 6.170851] Call Trace:
[ 6.170851] [] ? __setup_irq+0x3c7/0x420
[ 6.170851] [] ? request_threaded_irq+0x76/0x140
[ 6.170851] [] ? snd_es1688_ioctl+0x10/0x10
[ 6.170851] [] ? request_threaded_irq+0xb2/0x140
[ 6.170851] [] ? snd_es1688_create+0x96/0x330
[ 6.170851] [] ? snd_gusextreme_probe+0x18d/0x5a2
[ 6.170851] [] ? __driver_attach+0x80/0x80
[ 6.170851] [] ? sysfs_create_link+0xf/0x20
[ 6.170851] [] ? __driver_attach+0x80/0x80
[ 6.170851] [] ? isa_bus_probe+0x12/0x20
[ 6.170851] [] ? driver_probe_device+0x55/0x1c0
[ 6.170851] [] ? _raw_spin_unlock+0xf/0x30
[ 6.170851] [] ? klist_next+0x6a/0xe0
[ 6.170851] [] ? isa_bus_match+0x21/0x40
[ 6.170851] [] ? bus_for_each_drv+0x34/0x70
[ 6.170851] [] ? device_attach+0x7b/0x90
[ 6.170851] [] ? __driver_attach+0x80/0x80
[ 6.170851] [] ? bus_probe_device+0x5f/0x80
[ 6.170851] [] ? device_add+0x573/0x620
[ 6.170851] [] ? complete_all+0x40/0x60
[ 6.170851] [] ? _raw_spin_unlock_irqrestore+0x1a/0x30
[ 6.170851] [] ? isa_register_driver+0xb6/0x150
[ 6.170851] [] ? alsa_card_gusmax_init+0xf/0xf
[ 6.170851] [] ? do_one_initcall+0x7f/0x12b
[ 6.170851] [] ? kernel_init+0x112/0x1a9
[ 6.170851] [] ? do_early_param+0x77/0x77
[ 6.170851] [] ? do_one_initcall+0x12b/0x12b
[ 6.170851] [] ? kernel_thread_helper+0x6/0xd
[ 6.190170] es1688: can't grab IRQ 5
[ 6.190613] genirq: Flags mismatch irq 5. 00000000 (ES1688) vs. 00000000 (ES1688)
[ 6.191566] Pid: 1, comm: swapper Not tainted 3.5.0-00004-gceee0e9 #14
[ 6.192394] Call Trace:
[ 6.192685] [] ? __setup_irq+0x3c7/0x420
[ 6.193342] [] ? request_threaded_irq+0x76/0x140
[ 6.194081] [] ? snd_es1688_ioctl+0x10/0x10
[ 6.194607] [] ? request_threaded_irq+0xb2/0x140
[ 6.194607] [] ? snd_es1688_create+0x96/0x330
[ 6.194607] [] ? snd_gusextreme_probe+0x18d/0x5a2
[ 6.194607] [] ? __driver_attach+0x80/0x80
[ 6.194607] [] ? sysfs_create_link+0xf/0x20
[ 6.194607] [] ? __driver_attach+0x80/0x80
[ 6.194607] [] ? isa_bus_probe+0x12/0x20
[ 6.194607] [] ? driver_probe_device+0x55/0x1c0
[ 6.194607] [] ? _raw_spin_unlock+0xf/0x30
[ 6.194607] [] ? klist_next+0x6a/0xe0
[ 6.194607] [] ? isa_bus_match+0x21/0x40
[ 6.194607] [] ? bus_for_each_drv+0x34/0x70
[ 6.194607] [] ? device_attach+0x7b/0x90
[ 6.194607] [] ? __driver_attach+0x80/0x80
[ 6.194607] [] ? bus_probe_device+0x5f/0x80
[ 6.194607] [] ? device_add+0x573/0x620
[ 6.194607] [] ? complete_all+0x40/0x60
[ 6.194607] [] ? _raw_spin_unlock_irqrestore+0x1a/0x30
[ 6.194607] [] ? isa_register_driver+0xb6/0x150
[ 6.194607] [] ? alsa_card_gusmax_init+0xf/0xf
[ 6.194607] [] ? do_one_initcall+0x7f/0x12b
[ 6.194607] [] ? kernel_init+0x112/0x1a9
[ 6.194607] [] ? do_early_param+0x77/0x77
[ 6.194607] [] ? do_one_initcall+0x12b/0x12b
[ 6.194607] [] ? kernel_thread_helper+0x6/0xd
[ 6.210779] es1688: can't grab IRQ 5
[ 6.211305] gusextreme: probe of gusextreme.0 failed with error -16Signed-off-by: Daniel Mack
Signed-off-by: Fengguang Wu
Signed-off-by: Takashi Iwai
17 Jul, 2012
2 commits
-
In the previous commit, snd_opti9xx_configure() is called from the
resume handler but it's still marked as __devinit. Fix it.Reported-by: Fengguang Wu
Signed-off-by: Takashi Iwai -
Implement suspend/resume support for Opti 92x and 93x chips.
Tested with Opti 929A+AD1848 and Opti 931.Signed-off-by: Ondrej Zary
Signed-off-by: Takashi Iwai
16 Jul, 2012
2 commits
-
Yamaha OPL3-SAx chips don't resume properly when playback is running -
garbage is played after resume. Restoring the CS4231_PLAYBK_FORMAT register
last fixes the problem.Signed-off-by: Ondrej Zary
Signed-off-by: Takashi Iwai -
By setting SNDRV_PCM_INFO_RESUME, wss_lib claims that it can restore the card
state fully on resume. But in fact, it can't as DMA is not restored so any
playback/capture running during suspend will fail to continue after resume.Remove SNDRV_PCM_INFO_RESUME flag from pcm info field to fix the problem.
Signed-off-by: Ondrej Zary
Signed-off-by: Takashi Iwai
18 Jun, 2012
1 commit
-
MED3931 card did not work (failed with "OPTI chip not found") because
snd-opti9xx gets mc_indir_index from pnp by adding 2 to the pnp-reported port.
It probably works for some cards but not for this one. Datasheet says that
the port is always at 0xe?e so just force the lowest nibble to be 0xe.Also this card powers up with (ugly) 3D sound enabled. As there's no mixer
control for this, just disable it.Signed-off-by: Ondrej Zary
Signed-off-by: Takashi Iwai
23 May, 2012
1 commit
-
Pull trivial updates from Jiri Kosina:
"As usual, it's mostly typo fixes, redundant code elimination and some
documentation updates."* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
edac, mips: don't change code that has been removed in edac/mips tree
xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
lib: Change mail address of Oskar Schirmer
net: Change mail address of Oskar Schirmer
arm/m68k: Change mail address of Sebastian Hess
i2c: Change mail address of Oskar Schirmer
net: Fix tcp_build_and_update_options comment in struct tcp_sock
atomic64_32.h: fix parameter naming mismatch
Kconfig: replace "--- help ---" with "---help---"
c2port: fix bogus Kconfig "default no"
edac: Fix spelling errors.
qla1280: Remove redundant NULL check before release_firmware() call
remoteproc: remove redundant NULL check before release_firmware()
qla2xxx: Remove redundant NULL check before release_firmware() call.
aic94xx: Get rid of redundant NULL check before release_firmware() call
tehuti: delete redundant NULL check before release_firmware()
qlogic: get rid of a redundant test for NULL before call to release_firmware()
bna: remove redundant NULL test before release_firmware()
tg3: remove redundant NULL test before release_firmware() call
typhoon: get rid of redundant conditional before all to release_firmware()
...
10 Apr, 2012
1 commit
-
At the point of this error-handling code, both regions and the dma have
been allocated, so free it as done in previous and subsequent
error-handling code.Signed-off-by: Julia Lawall
Signed-off-by: Takashi Iwai
09 Apr, 2012
1 commit
-
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.Conflicts:
drivers/net/ethernet/realtek/r8169.c
29 Mar, 2012
1 commit
-
Fix module parameter data type to eliminate build warnings.
sound/isa/opti9xx/opti92x-ad1848.c:87:1: warning: return from incompatible pointer type
sound/isa/opti9xx/opti92x-ad1848.c:87:1: warning: return from incompatible pointer typeSigned-off-by: Randy Dunlap
Signed-off-by: Takashi Iwai
28 Mar, 2012
1 commit
-
This patch updates Jonathan Woithe's contact details across the kernel tree.
Signed-off-by: Jonathan Woithe
Signed-off-by: Jiri Kosina
06 Feb, 2012
1 commit
-
The header 'linux/moduleparam.h' is included twice in
'sound/isa/sb/emu8000_patch.c'. Once is enough.Signed-off-by: Jesper Juhl
Signed-off-by: Takashi Iwai
19 Dec, 2011
1 commit
-
module_param(bool) used to counter-intuitively take an int. In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.It's time to remove the int/unsigned int option. For this version
it'll simply give a warning, but it'll break next kernel version.Signed-off-by: Rusty Russell
Signed-off-by: Takashi Iwai
01 Nov, 2011
4 commits
-
These aren't modules, but they do make use of these macros, so
they will need export.h to get that definition. Previously,
they got it via the implicit module.h inclusion.Signed-off-by: Paul Gortmaker
-
Lots of sound drivers were getting module.h via the implicit presence
of it in but we are going to clean that up. So
fix up those users now.Signed-off-by: Paul Gortmaker
-
These files were getting access to these two via the implicit
presence of moduleparam.h everywhere. But that is being fixed, so
get these guys what they need in advance.Signed-off-by: Paul Gortmaker
-
The implicit presence of module.h lured several users into
incorrectly thinking that they only needed/used modparam.h
but once we clean up the module.h presence, these will show
up as build failures, so fix 'em now.Signed-off-by: Paul Gortmaker
22 Sep, 2011
1 commit
-
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang
Acked-by: Peter Ujfalusi
Acked-by: Mark Brown
Signed-off-by: Takashi Iwai
14 Sep, 2011
1 commit
-
The semantics of snd_mpu401_uart_new()'s interrupt parameters are
somewhat counterintuitive: To prevent the function from allocating its
own interrupt, either the irq number must be invalid, or the irq_flags
parameter must be zero. At the same time, the irq parameter being
invalid specifies that the mpu401 code has to work without an interrupt
allocated by the caller. This implies that, if there is an interrupt
and it is allocated by the caller, the irq parameter must be set to
a valid-looking number which then isn't actually used.With the removal of IRQF_DISABLED, zero becomes a valid irq_flags value,
which forces us to handle the parameters differently.This patch introduces a new flag MPU401_INFO_IRQ_HOOK for when the
device interrupt is handled by the caller, and makes the allocation of
the interrupt to depend only on the irq parameter. As suggested by
Takashi, the irq_flags parameter was dropped because, when used, it had
the constant value IRQF_DISABLED.Signed-off-by: Clemens Ladisch
Signed-off-by: Takashi Iwai
27 Jul, 2011
1 commit
-
we put FMODE_... in there
Signed-off-by: Al Viro
31 Mar, 2011
1 commit
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
02 Nov, 2010
1 commit
-
"gadget", "through", "command", "maintain", "maintain", "controller", "address",
"between", "initiali[zs]e", "instead", "function", "select", "already",
"equal", "access", "management", "hierarchy", "registration", "interest",
"relative", "memory", "offset", "already",Signed-off-by: Uwe Kleine-König
Signed-off-by: Jiri Kosina
09 Sep, 2010
1 commit
08 Sep, 2010
1 commit
-
The driver doesn't probe the device properly because of left-over cfg[]
that isn't used at all for msnd-classic device. This is only for msnd-
pinnacle.Signed-off-by: Takashi Iwai
07 Sep, 2010
1 commit
-
Signed-off-by: Joe Perches
Signed-off-by: Takashi Iwai
13 Aug, 2010
2 commits
-
Its hardware is handled more fully by the new azt1605/azt2316 drivers.
Signed-off-by: Rene Herman
Signed-off-by: Takashi Iwai -
This is a new driver for Aztech Sound Galaxy ISA soundcards based on the
AZT1605 and AZT2316 chipsets. It's constructed as two seperate drivers
for either chipset generated from the same source file, with (very)
minimal ifdeffery.The drivers check the SB DSP version to decide if they are being loaded
for the right chip. AZT1605 returns 2.1 by default and AZT2316 3.1.
This isn't full-proof as the DSP version can actually be set through
software but it's close enough -- as far as I've been able to see, the
DSP version can not be stored in the EEPROM and the cards will therefore
startup with the defaults.This distinction could (with the same success rate) also be used to
decide which chip we're looking at at runtime meaning a single, merged
driver is also an option but I feel it's actually nicer this way. A
merged driver would have to postpone translating the passed in resource
values to the card configuration until it knew which one it was looking
at and would need to postpone erring out on mpu_irq=10 for azt1605 and
mpu_irq=3 for azt2316.The drivers have been tested on various cards. For snd-azt1605:
FCC-ID I38-MMSN811: Aztech Sound Galaxy Nova 16 Extra
FCC-ID I38-MMSN822: Aztech Sound Galaxy Pro 16 IIand for snd-azt2316:
FCC-ID I38-MMSN824: Aztech Sound Galaxy Pro 16 AB
FCC-ID I38-MMSN826: Trust Sound Expert DeLuxe Wave 32 (05201)
FCC-ID I38-MMSN830: Trust Sound Expert DeLuxe 16+ (05202)
FCC-ID I38-MMSN837: Packard Bell ISA Soundcard 030069
FCC-ID I38-MMSN846: Trust Sound Expert DeLuxe 16-3D (06300)
FCC-ID I38-MMSN847: Trust Sound Expert DeLuxe Wave 32-3D (06301)
FCC-ID I38-MMSN852: Aztech Sound Galaxy Waverider Pro 32-3D826 and 846 were also marketed directly by Aztech and then known as:
FCC-ID I38-MMSN826: Aztech Sound Galaxy Waverider 32+
FCC-ID I38-MMSN846: Aztech Sound Galaxy Nova 16 Extra II-3DTogether, these cover the AZT1605 and AT2316A, AZT2316R and AZT2316-S
chipsets. All cards work fully -- full-duplex PCM, MIDI and FM. Full
duplex is a little flaky on some.I38-MSN811 tends to not work in full-duplex but sometimes does with the
highest success rate being achieved when you first start the capture and
then a playback instead of the other way around (it's a CS4231-KL
codec).The cards with an AD1845XP codec (my I38-MMSN826 and one of my
I38-MMSN830s) are also somewhat duplex-challenged. Sometimes full-duplex
works, sometimes not and this varies from try to try. This seems likely
to be a timing problem somewhere inside wss-lib.I38-MMSN826 has an additional "ICS2115 WaveFront" wavetable synth
onboard that isn't supported yet. The wavetable synths on I38-MMSN847
and I38-MMSN852 are wired directly to the standard MPU-401 UART and the
AUX1 input on the codec and work without problem.CD-ROM audio on the cards is routed to the codec "Line" input, Line-In
to its Aux input, and FM/Wavetable to its AUX1 input. I did not rename
the controls due to the capture source enumeration: I see that
capture-source overrides are hardcoded in wss-lib and this is just too
ugly to live.Versus the old snd-sgalaxy driver these drivers add support for the
models without a configuration EEPROM (which are common), full-duplex,
MPU-401 UART and OPL3. In the future they might grow support for that
ICS2115 WaveFront synth on 826 and an hwdep interface to write to the
EEPROM on the models that have one.Signed-off-by: Rene Herman
Signed-off-by: Takashi Iwai
29 Jul, 2010
2 commits
-
request_region() may fail, if so return -EBUSY.
Signed-off-by: Kulikov Vasiliy
Signed-off-by: Takashi Iwai -
get_user() may fail, if so return -EFAULT.
[Fixed one missing place by tiwai]
Signed-off-by: Kulikov Vasiliy
Signed-off-by: Takashi Iwai
20 May, 2010
2 commits
17 May, 2010
1 commit
-
Smatch complains that if (dev == SNDRV_CARDS) we're one past the end of
the array. That's unlikely to happen in real life, I suppose.Also smatch complains about "strcpy(card->shortname, pcm->name);"
The "pcm->name" buffer is 80 characters and "card->shortname" is 32
characters. If you follow the call paths it turns out we never actually
use more than 16 characters so it's not a problem. But anyway, let's
make it easy for people auditing this in the future.Signed-off-by: Dan Carpenter
Signed-off-by: Takashi Iwai
10 May, 2010
2 commits
-
The ESS ES968 chip is nothing more then a PnP companion
for a non-PnP audio chip. It was paired with non-PnP ESS' chips:
ES688 and ES1688. The ESS' audio chips are handled by the es1688
driver in native mode. The PnP cards are handled by the ES968
driver in SB compatible mode.Move the ES968 chip handling to the es1688 driver so the driver
can handle both PnP and non-PnP cards. The es968 is removed.Also, a new PnP id is added for the card I acquired (the change
was tested on this card).Signed-off-by: Krzysztof Helt
Signed-off-by: Takashi Iwai -
Allocate the snd_es1688 during the snd_card allocation.
This allows to remove the card pointer from the snd_es1688 structure.Signed-off-by: Krzysztof Helt
Signed-off-by: Takashi Iwai
26 Apr, 2010
1 commit
-
There is only one dma for the ESS ES968 based board.
Its index is 0 and not 1.This make the es968 card working.
Signed-off-by: Krzysztof Helt
Signed-off-by: Takashi Iwai
13 Apr, 2010
3 commits
-
The llseek implementation is identical for existing driver implementations,
so let's merge to the common layer. The same code for the text proc file
can be used even for the binary proc file.The driver can provide its own llseek method if needed. Then the common
code will be skipped.Signed-off-by: Takashi Iwai
-
Check the validity of the file position in the common info layer before
calling read or write callbacks in assumption that entry->size is set up
properly to indicate the max file size.Removed the redundant checks from the callbacks as well.
Signed-off-by: Takashi Iwai
-
Use loff_t, size_t and ssize_t for arguments of info callbacks
to follow the standard procfs.Signed-off-by: Takashi Iwai
30 Mar, 2010
1 commit
-
…it slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
