gwj / at91sam9263 · Commits

Commit eb69b50ad9806c4a3b5900392a5acc9837cffd18

Authored by balrog
1 parent 601d70b9

Prevent use of an uninitialised value in WM8750 and move buffer flush 

to a better place (Jan Kiszka).


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4223 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
hw/wm8750.c
  View file @eb69b50
@@ -76,10 +76,10 @@ static void wm8750_audio_in_cb(void *opaque, int avail_b) @@ -76,10 +76,10 @@ static void wm8750_audio_in_cb(void *opaque, int avail_b)
76 static void wm8750_audio_out_cb(void *opaque, int free_b) 76 static void wm8750_audio_out_cb(void *opaque, int free_b)
77 { 77 {
78 struct wm8750_s *s = (struct wm8750_s *) opaque; 78 struct wm8750_s *s = (struct wm8750_s *) opaque;
79 - wm8750_out_flush(s);  
80 79
81 s->req_out = free_b; 80 s->req_out = free_b;
82 s->data_req(s->opaque, free_b >> 2, s->req_in >> 2); 81 s->data_req(s->opaque, free_b >> 2, s->req_in >> 2);
  82 + wm8750_out_flush(s);
83 } 83 }
84 84
85 struct wm_rate_s { 85 struct wm_rate_s {
@@ -213,6 +213,7 @@ static void inline wm8750_mask_update(struct wm8750_s *s) @@ -213,6 +213,7 @@ static void inline wm8750_mask_update(struct wm8750_s *s)
213 void wm8750_reset(i2c_slave *i2c) 213 void wm8750_reset(i2c_slave *i2c)
214 { 214 {
215 struct wm8750_s *s = (struct wm8750_s *) i2c; 215 struct wm8750_s *s = (struct wm8750_s *) i2c;
  216 + s->rate = &wm_rate_table[0];
216 s->enable = 0; 217 s->enable = 0;
217 wm8750_set_format(s); 218 wm8750_set_format(s);
218 s->diff[0] = 0; 219 s->diff[0] = 0;