diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /sound/oss/vidc.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'sound/oss/vidc.c')
| -rw-r--r-- | sound/oss/vidc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index f0e0caa5320..12ba28e7b93 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c | |||
| @@ -227,7 +227,7 @@ static int vidc_audio_set_speed(int dev, int rate) | |||
| 227 | } else { | 227 | } else { |
| 228 | /*printk("VIDC: internal %d %d %d\n", rate, rate_int, hwrate);*/ | 228 | /*printk("VIDC: internal %d %d %d\n", rate, rate_int, hwrate);*/ |
| 229 | hwctrl=0x00000003; | 229 | hwctrl=0x00000003; |
| 230 | /* Allow rougly 0.4% tolerance */ | 230 | /* Allow roughly 0.4% tolerance */ |
| 231 | if (diff_int > (rate/256)) | 231 | if (diff_int > (rate/256)) |
| 232 | rate=rate_int; | 232 | rate=rate_int; |
| 233 | } | 233 | } |