Changeset 679 for GPL/trunk/lib32/soundmixer.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• lib32/soundmixer.c (modified) (15 diffs)

GPL/trunk/lib32/soundmixer.c

@@ -148 +148 @@
   }
   //retrieve mixer information
-  ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+  ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file,
                   SNDRV_CTL_IOCTL_CARD_INFO,
                   (ULONG)&pHandle->info);
@@ -157 +157 @@
   pHandle->list.offset = 0;
   pHandle->list.space  = 0;
-  ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+  ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file,
                   SNDRV_CTL_IOCTL_ELEM_LIST,
                   (ULONG)&pHandle->list);
@@ -172 +172 @@
   pHandle->list.space  = pHandle->list.count;
   pHandle->list.pids   = pHandle->pids;
-  ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+  ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file,
                   SNDRV_CTL_IOCTL_ELEM_LIST,
                   (ULONG)&pHandle->list);
@@ -271 +271 @@
       pElemInfo->value.enumerated.item = i;
       pElemInfo->id.numid = pHandle->pids[idx].numid;
-      ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
+      ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
       if(ret) {
         DebugInt3();
@@ -484 +484 @@
     pElem->value.integer.value[0] = TRUE;  //switch, not mute control (inversed)
     pElem->value.integer.value[1] = TRUE;
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
+    ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
   }
   //request information about mixer control
   pElemInfo->id.numid = pHandle->pids[idx].numid;
-  ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
+  ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
   if(ret) {
     ret = UNIXToOSSError(ret);
@@ -515 +515 @@
 
 #if 1
-  ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
+  ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
 #else
   // looking for more, then one opened streams to prevent of muting active stream
@@ -528 +528 @@
   {
     dprintf(("OSS32_MixSetVolume Ioctl"));
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
+    ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
 
     if(idxMute != -1 && volume == 0) {
@@ -538 +538 @@
       pElem->value.integer.value[1] = FALSE;
       dprintf(("OSS32_MixSetVolume Ioctl mute"));
-      ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
+      ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
     }
   }
@@ -603 +603 @@
           //request information about mixer control
           pElemInfo->id.numid       = pHandle->pids[idx].numid;
-          ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
+          ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
           if(ret) {
             ret = UNIXToOSSError(ret);
@@ -621 +621 @@
           }
 
-          ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
+          ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
           if(ret) {
             ret = UNIXToOSSError(ret);
@@ -631 +631 @@
       //request information about mixer control
       pElemInfo->id.numid = pHandle->pids[idx].numid;
-      ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
+      ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
       if(ret) {
         ret = UNIXToOSSError(ret);
@@ -678 +678 @@
     //request information about mixer control
     pElemInfo->id.numid = pHandle->pids[idx].numid;
-    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
+    ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_INFO, (ULONG)pElemInfo);
     if(ret) {
       ret = UNIXToOSSError(ret);
@@ -707 +707 @@
 
   dprintf(("OSS32_MixSetProperty of %s to %x", pHandle->pids[idx].name, ulValue));
-  ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
+  ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_CTL_IOCTL_ELEM_WRITE, (ULONG)pElem);
 
   kfree(pElem);
@@ -849 +849 @@
   }
   //retrieve mixer information
-  ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+  ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file,
                   SNDRV_CTL_IOCTL_CARD_INFO,
                   (ULONG)&pHandle->info);
@@ -911 +911 @@
   }
   //retrieve mixer information
-  ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file,
+  ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file,
                   SNDRV_CTL_IOCTL_CARD_INFO,
                   (ULONG)&pHandle->info);