diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
| commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
| tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /sound/pci/riptide | |
| parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
| parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) | |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/pci/riptide')
| -rw-r--r-- | sound/pci/riptide/riptide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index bb08a2855fce..960a227eb653 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
| @@ -1058,7 +1058,7 @@ setsamplerate(struct cmdif *cif, unsigned char *intdec, unsigned int rate) | |||
| 1058 | rptr.retwords[2] != M && | 1058 | rptr.retwords[2] != M && |
| 1059 | rptr.retwords[3] != N && | 1059 | rptr.retwords[3] != N && |
| 1060 | i++ < MAX_WRITE_RETRY); | 1060 | i++ < MAX_WRITE_RETRY); |
| 1061 | if (i == MAX_WRITE_RETRY) { | 1061 | if (i > MAX_WRITE_RETRY) { |
| 1062 | snd_printdd("sent samplerate %d: %d failed\n", | 1062 | snd_printdd("sent samplerate %d: %d failed\n", |
| 1063 | *intdec, rate); | 1063 | *intdec, rate); |
| 1064 | return -EIO; | 1064 | return -EIO; |