return ENODEV for disconnected devices

Return -ENODEV instead of -ENOTTY for disconnected devices.

diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index 47f3501f3dfaa8b395c469b4ac8038babf89eb0b..2f469c8aa107f05b58173d4972ea664b4ca205a6 100644 (file)
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -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;
        }

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index ed500b8548ffa5de227eb0687a90f0d958e62007..5c00820fbc9d7bb24943c8ccc3c1cbc08bff5003 100644 (file)
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -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;
        }

diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
index d54b403126c45e2813a72497fd82bc15ba49a4a7..31905fde950248f8bc212027850bb8fea352ee76 100644 (file)
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -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;
        }

diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index fbb9d0464a1254fd0eff64af102e32d3315ecd36..a9ea1429b60594e365f4f09186feed3e64292dd6 100644 (file)
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -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;
        }

diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
index e458b4690be2305e90456292f7d59a36165a0364..e94125adfdd1392846f26b47672ee0a867a994a9 100644 (file)
--- a/src/pcm/pcm_local.h
+++ b/src/pcm/pcm_local.h
@@ -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;
                }