mirror of
				https://github.com/alsa-project/alsa-lib.git
				synced 2025-11-03 09:01:52 -05:00 
			
		
		
		
	Fix snd_pcm_write*() return values at start up
If an error occurs at starting the stream, snd_pcm_write*() should return an error value instead of the size to be written.
This commit is contained in:
		
							parent
							
								
									944a4ad310
								
							
						
					
					
						commit
						912f0d5ddf
					
				
					 1 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
					@ -6494,9 +6494,6 @@ snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area
 | 
				
			||||||
		if (err < 0)
 | 
							if (err < 0)
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
		frames = err;
 | 
							frames = err;
 | 
				
			||||||
		offset += frames;
 | 
					 | 
				
			||||||
		size -= frames;
 | 
					 | 
				
			||||||
		xfer += frames;
 | 
					 | 
				
			||||||
		if (state == SND_PCM_STATE_PREPARED) {
 | 
							if (state == SND_PCM_STATE_PREPARED) {
 | 
				
			||||||
			snd_pcm_sframes_t hw_avail = pcm->buffer_size - avail;
 | 
								snd_pcm_sframes_t hw_avail = pcm->buffer_size - avail;
 | 
				
			||||||
			hw_avail += frames;
 | 
								hw_avail += frames;
 | 
				
			||||||
| 
						 | 
					@ -6509,6 +6506,9 @@ snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area
 | 
				
			||||||
					goto _end;
 | 
										goto _end;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
							offset += frames;
 | 
				
			||||||
 | 
							size -= frames;
 | 
				
			||||||
 | 
							xfer += frames;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 _end:
 | 
					 _end:
 | 
				
			||||||
	return xfer > 0 ? (snd_pcm_sframes_t) xfer : snd_pcm_check_error(pcm, err);
 | 
						return xfer > 0 ? (snd_pcm_sframes_t) xfer : snd_pcm_check_error(pcm, err);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue