diff --git a/libao2/ao_alsa1x.c b/libao2/ao_alsa1x.c
index de05131fda..5b04d806d4 100644
--- a/libao2/ao_alsa1x.c
+++ b/libao2/ao_alsa1x.c
@@ -156,8 +156,8 @@ static int init(int rate_hz, int channels, int format, int flags)
 	return(0);
     }
 
-    if (ao_data.subdevice != NULL)
-	alsa_device = ao_data.subdevice;
+    if (ao_subdevice != NULL)
+	alsa_device = ao_subdevice;
 
     if (alsa_device == NULL)
     {
diff --git a/libao2/ao_alsa9.c b/libao2/ao_alsa9.c
index de05131fda..5b04d806d4 100644
--- a/libao2/ao_alsa9.c
+++ b/libao2/ao_alsa9.c
@@ -156,8 +156,8 @@ static int init(int rate_hz, int channels, int format, int flags)
 	return(0);
     }
 
-    if (ao_data.subdevice != NULL)
-	alsa_device = ao_data.subdevice;
+    if (ao_subdevice != NULL)
+	alsa_device = ao_subdevice;
 
     if (alsa_device == NULL)
     {