1 files changed, 7 insertions, 16 deletions

diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index 47d9ea97de0..0c00eb4088e 100644
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -22,20 +22,9 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 
-#define DAIO_RESOURCE_NUM       NUM_DAIOTYP
 #define DAIO_OUT_MAX            SPDIFOO
 
-union daio_usage {
-        struct {
-                unsigned short lineo1:1;
-                unsigned short lineo2:1;
-                unsigned short lineo3:1;
-                unsigned short lineo4:1;
-                unsigned short spdifoo:1;
-                unsigned short lineim:1;
-                unsigned short spdifio:1;
-                unsigned short spdifi1:1;
-        } bf;
+struct daio_usage {
         unsigned short data;
 };
 
@@ -61,6 +50,7 @@ struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = {
         [LINEO3] = {.left = 0x50, .right = 0x51},
         [LINEO4] = {.left = 0x70, .right = 0x71},
         [LINEIM] = {.left = 0x45, .right = 0xc5},
+        [MIC]    = {.left = 0x55, .right = 0xd5},
         [SPDIFOO] = {.left = 0x00, .right = 0x01},
         [SPDIFIO] = {.left = 0x05, .right = 0x85},
 };
@@ -138,6 +128,7 @@ static unsigned int daio_device_index(enum DAIOTYP type, struct hw *hw)
                 case LINEO3:    return 5;
                 case LINEO4:    return 6;
                 case LINEIM:    return 4;
+                case MIC:       return 5;
                 default:        return -EINVAL;
                 }
         default:
@@ -519,17 +510,17 @@ static int dai_rsc_uninit(struct dai *dai)
 
 static int daio_mgr_get_rsc(struct rsc_mgr *mgr, enum DAIOTYP type)
 {
-        if (((union daio_usage *)mgr->rscs)->data & (0x1 << type))
+        if (((struct daio_usage *)mgr->rscs)->data & (0x1 << type))
                 return -ENOENT;
 
-        ((union daio_usage *)mgr->rscs)->data |= (0x1 << type);
+        ((struct daio_usage *)mgr->rscs)->data |= (0x1 << type);
 
         return 0;
 }
 
 static int daio_mgr_put_rsc(struct rsc_mgr *mgr, enum DAIOTYP type)
 {
-        ((union daio_usage *)mgr->rscs)->data &= ~(0x1 << type);
+        ((struct daio_usage *)mgr->rscs)->data &= ~(0x1 << type);
 
         return 0;
 }
@@ -712,7 +703,7 @@ int daio_mgr_create(void *hw, struct daio_mgr **rdaio_mgr)
         if (!daio_mgr)
                 return -ENOMEM;
 
-        err = rsc_mgr_init(&daio_mgr->mgr, DAIO, DAIO_RESOURCE_NUM, hw);
+        err = rsc_mgr_init(&daio_mgr->mgr, DAIO, NUM_DAIOTYP, hw);
         if (err)
                 goto error1;