Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
3454a476
Commit
3454a476
authored
Aug 30, 2017
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' into for-next
parents
0be04a69
bcab3a6e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
sound/core/pcm_native.c
sound/core/pcm_native.c
+5
-1
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_conexant.c
+1
-0
sound/soc/codecs/rt5677.c
sound/soc/codecs/rt5677.c
+1
-0
No files found.
sound/core/pcm_native.c
View file @
3454a476
...
...
@@ -3064,6 +3064,7 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
{
snd_pcm_uframes_t
*
frames
=
arg
;
snd_pcm_sframes_t
result
;
int
err
;
switch
(
cmd
)
{
case
SNDRV_PCM_IOCTL_FORWARD
:
...
...
@@ -3083,7 +3084,10 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
case
SNDRV_PCM_IOCTL_START
:
return
snd_pcm_start_lock_irq
(
substream
);
case
SNDRV_PCM_IOCTL_DRAIN
:
return
snd_pcm_drain
(
substream
,
NULL
);
snd_power_lock
(
substream
->
pcm
->
card
);
err
=
snd_pcm_drain
(
substream
,
NULL
);
snd_power_unlock
(
substream
->
pcm
->
card
);
return
err
;
case
SNDRV_PCM_IOCTL_DROP
:
return
snd_pcm_drop
(
substream
);
case
SNDRV_PCM_IOCTL_DELAY
:
...
...
sound/pci/hda/patch_conexant.c
View file @
3454a476
...
...
@@ -947,6 +947,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
SND_PCI_QUIRK
(
0x17aa
,
0x390b
,
"Lenovo G50-80"
,
CXT_FIXUP_STEREO_DMIC
),
SND_PCI_QUIRK
(
0x17aa
,
0x3975
,
"Lenovo U300s"
,
CXT_FIXUP_STEREO_DMIC
),
SND_PCI_QUIRK
(
0x17aa
,
0x3977
,
"Lenovo IdeaPad U310"
,
CXT_FIXUP_STEREO_DMIC
),
SND_PCI_QUIRK
(
0x17aa
,
0x3978
,
"Lenovo G50-70"
,
CXT_FIXUP_STEREO_DMIC
),
SND_PCI_QUIRK
(
0x17aa
,
0x397b
,
"Lenovo S205"
,
CXT_FIXUP_STEREO_DMIC
),
SND_PCI_QUIRK_VENDOR
(
0x17aa
,
"Thinkpad"
,
CXT_FIXUP_THINKPAD_ACPI
),
SND_PCI_QUIRK
(
0x1c06
,
0x2011
,
"Lemote A1004"
,
CXT_PINCFG_LEMOTE_A1004
),
...
...
sound/soc/codecs/rt5677.c
View file @
3454a476
...
...
@@ -5021,6 +5021,7 @@ static const struct regmap_config rt5677_regmap = {
static
const
struct
i2c_device_id
rt5677_i2c_id
[]
=
{
{
"rt5677"
,
RT5677
},
{
"rt5676"
,
RT5676
},
{
"RT5677CE:00"
,
RT5677
},
{
}
};
MODULE_DEVICE_TABLE
(
i2c
,
rt5677_i2c_id
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment