mirror of
				https://github.com/alsa-project/alsa-lib.git
				synced 2025-11-03 09:01:52 -05:00 
			
		
		
		
	return ENODEV for disconnected devices
Return -ENODEV instead of -ENOTTY for disconnected devices.
This commit is contained in:
		
							parent
							
								
									d730ff3556
								
							
						
					
					
						commit
						8f61812f1c
					
				
					 5 changed files with 15 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -2231,7 +2231,7 @@ int snd_pcm_wait(snd_pcm_t *pcm, int timeout)
 | 
			
		|||
		case SND_PCM_STATE_SUSPENDED:
 | 
			
		||||
			return -ESTRPIPE;
 | 
			
		||||
		case SND_PCM_STATE_DISCONNECTED:
 | 
			
		||||
			return -ENOTTY;	/* linux VFS does this? */
 | 
			
		||||
			return -ENODEV;
 | 
			
		||||
		default:
 | 
			
		||||
			return 1;
 | 
			
		||||
		}
 | 
			
		||||
| 
						 | 
				
			
			@ -2287,7 +2287,7 @@ int snd_pcm_wait_nocheck(snd_pcm_t *pcm, int timeout)
 | 
			
		|||
				case SND_PCM_STATE_SUSPENDED:
 | 
			
		||||
					return -ESTRPIPE;
 | 
			
		||||
				case SND_PCM_STATE_DISCONNECTED:
 | 
			
		||||
					return -ENOTTY;	/* linux VFS does this? */
 | 
			
		||||
					return -ENODEV;
 | 
			
		||||
				default:
 | 
			
		||||
					return -EIO;
 | 
			
		||||
				}
 | 
			
		||||
| 
						 | 
				
			
			@ -6350,7 +6350,7 @@ snd_pcm_sframes_t snd_pcm_read_areas(snd_pcm_t *pcm, const snd_pcm_channel_area_
 | 
			
		|||
	case SND_PCM_STATE_SUSPENDED:
 | 
			
		||||
		return -ESTRPIPE;
 | 
			
		||||
	case SND_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		return -EBADFD;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			@ -6424,7 +6424,7 @@ snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area
 | 
			
		|||
	case SND_PCM_STATE_SUSPENDED:
 | 
			
		||||
		return -ESTRPIPE;
 | 
			
		||||
	case SND_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		return -EBADFD;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -338,7 +338,7 @@ static int snd_pcm_dmix_sync_ptr(snd_pcm_t *pcm)
 | 
			
		|||
	switch (snd_pcm_state(dmix->spcm)) {
 | 
			
		||||
	case SND_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		dmix->state = SND_PCM_STATE_DISCONNECTED;
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			@ -445,7 +445,7 @@ static int snd_pcm_dmix_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
 | 
			
		|||
	case SNDRV_PCM_STATE_XRUN:
 | 
			
		||||
		return -EPIPE;
 | 
			
		||||
	case SNDRV_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		return -EBADFD;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			@ -467,7 +467,7 @@ static int snd_pcm_dmix_hwsync(snd_pcm_t *pcm)
 | 
			
		|||
	case SNDRV_PCM_STATE_XRUN:
 | 
			
		||||
		return -EPIPE;
 | 
			
		||||
	case SNDRV_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		return -EBADFD;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -166,7 +166,7 @@ static int snd_pcm_dshare_sync_ptr(snd_pcm_t *pcm)
 | 
			
		|||
	switch (snd_pcm_state(dshare->spcm)) {
 | 
			
		||||
	case SND_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		dshare->state = SNDRV_PCM_STATE_DISCONNECTED;
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			@ -272,7 +272,7 @@ static int snd_pcm_dshare_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
 | 
			
		|||
	case SNDRV_PCM_STATE_XRUN:
 | 
			
		||||
		return -EPIPE;
 | 
			
		||||
	case SNDRV_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		return -EBADFD;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			@ -292,7 +292,7 @@ static int snd_pcm_dshare_hwsync(snd_pcm_t *pcm)
 | 
			
		|||
	case SNDRV_PCM_STATE_XRUN:
 | 
			
		||||
		return -EPIPE;
 | 
			
		||||
	case SNDRV_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		return -EBADFD;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -119,7 +119,7 @@ static int snd_pcm_dsnoop_sync_ptr(snd_pcm_t *pcm)
 | 
			
		|||
	switch (snd_pcm_state(dsnoop->spcm)) {
 | 
			
		||||
	case SND_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED;
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			@ -190,7 +190,7 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
 | 
			
		|||
		return SND_PCM_STATE_SUSPENDED;
 | 
			
		||||
	case SND_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED;
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		break;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			@ -215,7 +215,7 @@ static int snd_pcm_dsnoop_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
 | 
			
		|||
	case SNDRV_PCM_STATE_XRUN:
 | 
			
		||||
		return -EPIPE;
 | 
			
		||||
	case SNDRV_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		return -EBADFD;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			@ -235,7 +235,7 @@ static int snd_pcm_dsnoop_hwsync(snd_pcm_t *pcm)
 | 
			
		|||
	case SNDRV_PCM_STATE_XRUN:
 | 
			
		||||
		return -EPIPE;
 | 
			
		||||
	case SNDRV_PCM_STATE_DISCONNECTED:
 | 
			
		||||
		return -ENOTTY;
 | 
			
		||||
		return -ENODEV;
 | 
			
		||||
	default:
 | 
			
		||||
		return -EBADFD;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -288,7 +288,7 @@ static inline int snd_pcm_check_error(snd_pcm_t *pcm, int err)
 | 
			
		|||
		case SND_PCM_STATE_SUSPENDED:
 | 
			
		||||
			return -ESTRPIPE;
 | 
			
		||||
		case SND_PCM_STATE_DISCONNECTED:
 | 
			
		||||
			return -ENOTTY;
 | 
			
		||||
			return -ENODEV;
 | 
			
		||||
		default:
 | 
			
		||||
			break;
 | 
			
		||||
		}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue