git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
em28xx
/
em28xx-core.c
diff --git
a/drivers/media/video/em28xx/em28xx-core.c
b/drivers/media/video/em28xx/em28xx-core.c
index 7d1537cab8679f03d8fc4188fd1a2bfe9642e247..c1caaa855b99b16e9d09962a0000e5d48817bd5f 100644
(file)
--- a/
drivers/media/video/em28xx/em28xx-core.c
+++ b/
drivers/media/video/em28xx/em28xx-core.c
@@
-267,7
+267,7
@@
static int em28xx_write_ac97(struct em28xx *dev, u8 reg, u8 *val)
for (i = 0; i < 10; i++) {
if ((ret = em28xx_read_reg(dev, AC97BUSY_REG)) < 0)
return ret;
- if (!(
(u8) ret) & 0x01
)
+ if (!(
ret & 0x01)
)
return 0;
msleep(5);
}