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
05a33e3d
Commit
05a33e3d
authored
Sep 10, 2009
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/oxygen' into for-linus
* topic/oxygen: sound: oxygen: work around MCE when changing volume
parents
fa285190
f1bc07af
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
10 deletions
+1
-10
sound/pci/oxygen/oxygen_io.c
sound/pci/oxygen/oxygen_io.c
+1
-10
No files found.
sound/pci/oxygen/oxygen_io.c
View file @
05a33e3d
...
@@ -215,17 +215,8 @@ EXPORT_SYMBOL(oxygen_write_spi);
...
@@ -215,17 +215,8 @@ EXPORT_SYMBOL(oxygen_write_spi);
void
oxygen_write_i2c
(
struct
oxygen
*
chip
,
u8
device
,
u8
map
,
u8
data
)
void
oxygen_write_i2c
(
struct
oxygen
*
chip
,
u8
device
,
u8
map
,
u8
data
)
{
{
unsigned
long
timeout
;
/* should not need more than about 300 us */
/* should not need more than about 300 us */
timeout
=
jiffies
+
msecs_to_jiffies
(
1
);
msleep
(
1
);
do
{
if
(
!
(
oxygen_read16
(
chip
,
OXYGEN_2WIRE_BUS_STATUS
)
&
OXYGEN_2WIRE_BUSY
))
break
;
udelay
(
1
);
cond_resched
();
}
while
(
time_after_eq
(
timeout
,
jiffies
));
oxygen_write8
(
chip
,
OXYGEN_2WIRE_MAP
,
map
);
oxygen_write8
(
chip
,
OXYGEN_2WIRE_MAP
,
map
);
oxygen_write8
(
chip
,
OXYGEN_2WIRE_DATA
,
data
);
oxygen_write8
(
chip
,
OXYGEN_2WIRE_DATA
,
data
);
...
...
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