From 6d246526ce3c145b2831285def6983f5de6190d3 Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Sat, 9 Jan 2010 17:54:07 +0300
Subject: [PATCH] oss: issue OSS_GETVERSION ioctl only when needed

Signed-off-by: malc <av1474@comtv.ru>
---
 audio/ossaudio.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index fe6fb523bc..79d1daa1c0 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -244,9 +244,6 @@ static int oss_open (int in, struct oss_params *req,
                      struct oss_params *obt, int *pfd)
 {
     int fd;
-#ifdef USE_DSP_POLICY
-    int version;
-#endif
     int oflags = conf.exclusive ? O_EXCL : 0;
     audio_buf_info abinfo;
     int fmt, freq, nchannels;
@@ -288,22 +285,25 @@ static int oss_open (int in, struct oss_params *req,
     }
 
 #ifdef USE_DSP_POLICY
-    if (ioctl (fd, OSS_GETVERSION, &version)) {
-        oss_logerr2 (errno, typ, "Failed to get OSS version\n");
-        version = 0;
-    }
+    if (conf.policy >= 0) {
+        int version;
 
-    if (conf.debug) {
-        dolog ("OSS version = %#x\n", version);
-    }
+        if (ioctl (fd, OSS_GETVERSION, &version)) {
+            oss_logerr2 (errno, typ, "Failed to get OSS version\n");
+            version = 0;
+        }
 
-    if (conf.policy >= 0 && version >= 0x040000)
-    {
-        int policy = conf.policy;
-        if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) {
-            oss_logerr2 (errno, typ, "Failed to set timing policy to %d\n",
-                         conf.policy);
-            goto err;
+        if (conf.debug) {
+            dolog ("OSS version = %#x\n", version);
+        }
+
+        if (version >= 0x040000) {
+            int policy = conf.policy;
+            if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) {
+                oss_logerr2 (errno, typ, "Failed to set timing policy to %d\n",
+                             conf.policy);
+                goto err;
+            }
         }
     }
     else