Commit 9f43a3f5 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/audio.3' into staging 



# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/audio.3:
  ossaudio: check for oss support in oss_audio_init
  Revert "ossaudio: do not enable by default"

Message-id: 1383823947-5132-1-git-send-email-kraxel@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 6bddfae3 73204cff

audio/ossaudio.c

+5 −1
Original line number Diff line number Diff line
@@ -849,6 +849,10 @@ static int oss_ctl_in (HWVoiceIn *hw, int cmd, ...) 


static void *oss_audio_init (void)

{

    if (access(conf.devpath_in, R_OK | W_OK) < 0 ||

        access(conf.devpath_out, R_OK | W_OK) < 0) {

        return NULL;

    }

    return &conf;

}
@@ -932,7 +936,7 @@ struct audio_driver oss_audio_driver = { 
    .init           = oss_audio_init,

    .fini           = oss_audio_fini,

    .pcm_ops        = &oss_pcm_ops,

    .can_be_default = 0,

    .can_be_default = 1,

    .max_voices_out = INT_MAX,

    .max_voices_in  = INT_MAX,

    .voice_size_out = sizeof (OSSVoiceOut),