diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/i2c/other/ak4xxx-adda.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/i2c/other/ak4xxx-adda.c')
| -rw-r--r-- | sound/i2c/other/ak4xxx-adda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/i2c/other/ak4xxx-adda.c b/sound/i2c/other/ak4xxx-adda.c index 42d7844ecd0b..57ccba88700d 100644 --- a/sound/i2c/other/ak4xxx-adda.c +++ b/sound/i2c/other/ak4xxx-adda.c | |||
| @@ -878,7 +878,7 @@ static int build_deemphasis(struct snd_akm4xxx *ak, int num_emphs) | |||
| 878 | static void proc_regs_read(struct snd_info_entry *entry, | 878 | static void proc_regs_read(struct snd_info_entry *entry, |
| 879 | struct snd_info_buffer *buffer) | 879 | struct snd_info_buffer *buffer) |
| 880 | { | 880 | { |
| 881 | struct snd_akm4xxx *ak = (struct snd_akm4xxx *)entry->private_data; | 881 | struct snd_akm4xxx *ak = entry->private_data; |
| 882 | int reg, val, chip; | 882 | int reg, val, chip; |
| 883 | for (chip = 0; chip < ak->num_chips; chip++) { | 883 | for (chip = 0; chip < ak->num_chips; chip++) { |
| 884 | for (reg = 0; reg < ak->total_regs; reg++) { | 884 | for (reg = 0; reg < ak->total_regs; reg++) { |