lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix/misc' into topic/misc

Browse Source 
Conflicts:
	sound/pci/hda/patch_realtek.c
This commit is contained in:
Takashi Iwai
2010-02-17 14:24:46 +01:00
parent 291186e049 9d3415a8cc
commit 7fb3a069bc
1419 changed files with 35700 additions and 13836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/riptide/riptide.c
View File

@ -1058,7 +1058,7 @@ setsamplerate(struct cmdif *cif, unsigned char *intdec, unsigned int rate)
rptr.retwords[2] != M &&
rptr.retwords[3] != N &&
i++ < MAX_WRITE_RETRY);
if (i == MAX_WRITE_RETRY) {
if (i > MAX_WRITE_RETRY) {
snd_printdd("sent samplerate %d: %d failed\n",
*intdec, rate);
return -EIO;