diff options
Diffstat (limited to 'sound/pci/ctxfi/ctamixer.c')
| -rw-r--r-- | sound/pci/ctxfi/ctamixer.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c index a7f4a671f7b7..fee35cfc0c7f 100644 --- a/sound/pci/ctxfi/ctamixer.c +++ b/sound/pci/ctxfi/ctamixer.c | |||
| @@ -63,7 +63,7 @@ static int amixer_set_input(struct amixer *amixer, struct rsc *rsc) | |||
| 63 | hw = amixer->rsc.hw; | 63 | hw = amixer->rsc.hw; |
| 64 | hw->amixer_set_mode(amixer->rsc.ctrl_blk, AMIXER_Y_IMMEDIATE); | 64 | hw->amixer_set_mode(amixer->rsc.ctrl_blk, AMIXER_Y_IMMEDIATE); |
| 65 | amixer->input = rsc; | 65 | amixer->input = rsc; |
| 66 | if (NULL == rsc) | 66 | if (!rsc) |
| 67 | hw->amixer_set_x(amixer->rsc.ctrl_blk, BLANK_SLOT); | 67 | hw->amixer_set_x(amixer->rsc.ctrl_blk, BLANK_SLOT); |
| 68 | else | 68 | else |
| 69 | hw->amixer_set_x(amixer->rsc.ctrl_blk, | 69 | hw->amixer_set_x(amixer->rsc.ctrl_blk, |
| @@ -99,7 +99,7 @@ static int amixer_set_sum(struct amixer *amixer, struct sum *sum) | |||
| 99 | 99 | ||
| 100 | hw = amixer->rsc.hw; | 100 | hw = amixer->rsc.hw; |
| 101 | amixer->sum = sum; | 101 | amixer->sum = sum; |
| 102 | if (NULL == sum) { | 102 | if (!sum) { |
| 103 | hw->amixer_set_se(amixer->rsc.ctrl_blk, 0); | 103 | hw->amixer_set_se(amixer->rsc.ctrl_blk, 0); |
| 104 | } else { | 104 | } else { |
| 105 | hw->amixer_set_se(amixer->rsc.ctrl_blk, 1); | 105 | hw->amixer_set_se(amixer->rsc.ctrl_blk, 1); |
| @@ -124,20 +124,20 @@ static int amixer_commit_write(struct amixer *amixer) | |||
| 124 | 124 | ||
| 125 | /* Program master and conjugate resources */ | 125 | /* Program master and conjugate resources */ |
| 126 | amixer->rsc.ops->master(&amixer->rsc); | 126 | amixer->rsc.ops->master(&amixer->rsc); |
| 127 | if (NULL != input) | 127 | if (input) |
| 128 | input->ops->master(input); | 128 | input->ops->master(input); |
| 129 | 129 | ||
| 130 | if (NULL != sum) | 130 | if (sum) |
| 131 | sum->rsc.ops->master(&sum->rsc); | 131 | sum->rsc.ops->master(&sum->rsc); |
| 132 | 132 | ||
| 133 | for (i = 0; i < amixer->rsc.msr; i++) { | 133 | for (i = 0; i < amixer->rsc.msr; i++) { |
| 134 | hw->amixer_set_dirty_all(amixer->rsc.ctrl_blk); | 134 | hw->amixer_set_dirty_all(amixer->rsc.ctrl_blk); |
| 135 | if (NULL != input) { | 135 | if (input) { |
| 136 | hw->amixer_set_x(amixer->rsc.ctrl_blk, | 136 | hw->amixer_set_x(amixer->rsc.ctrl_blk, |
| 137 | input->ops->output_slot(input)); | 137 | input->ops->output_slot(input)); |
| 138 | input->ops->next_conj(input); | 138 | input->ops->next_conj(input); |
| 139 | } | 139 | } |
| 140 | if (NULL != sum) { | 140 | if (sum) { |
| 141 | hw->amixer_set_sadr(amixer->rsc.ctrl_blk, | 141 | hw->amixer_set_sadr(amixer->rsc.ctrl_blk, |
| 142 | sum->rsc.ops->index(&sum->rsc)); | 142 | sum->rsc.ops->index(&sum->rsc)); |
| 143 | sum->rsc.ops->next_conj(&sum->rsc); | 143 | sum->rsc.ops->next_conj(&sum->rsc); |
| @@ -147,10 +147,10 @@ static int amixer_commit_write(struct amixer *amixer) | |||
| 147 | amixer->rsc.ops->next_conj(&amixer->rsc); | 147 | amixer->rsc.ops->next_conj(&amixer->rsc); |
| 148 | } | 148 | } |
| 149 | amixer->rsc.ops->master(&amixer->rsc); | 149 | amixer->rsc.ops->master(&amixer->rsc); |
| 150 | if (NULL != input) | 150 | if (input) |
| 151 | input->ops->master(input); | 151 | input->ops->master(input); |
| 152 | 152 | ||
| 153 | if (NULL != sum) | 153 | if (sum) |
| 154 | sum->rsc.ops->master(&sum->rsc); | 154 | sum->rsc.ops->master(&sum->rsc); |
| 155 | 155 | ||
| 156 | return 0; | 156 | return 0; |
| @@ -303,7 +303,7 @@ int amixer_mgr_create(void *hw, struct amixer_mgr **ramixer_mgr) | |||
| 303 | 303 | ||
| 304 | *ramixer_mgr = NULL; | 304 | *ramixer_mgr = NULL; |
| 305 | amixer_mgr = kzalloc(sizeof(*amixer_mgr), GFP_KERNEL); | 305 | amixer_mgr = kzalloc(sizeof(*amixer_mgr), GFP_KERNEL); |
| 306 | if (NULL == amixer_mgr) | 306 | if (!amixer_mgr) |
| 307 | return -ENOMEM; | 307 | return -ENOMEM; |
| 308 | 308 | ||
| 309 | err = rsc_mgr_init(&amixer_mgr->mgr, AMIXER, AMIXER_RESOURCE_NUM, hw); | 309 | err = rsc_mgr_init(&amixer_mgr->mgr, AMIXER, AMIXER_RESOURCE_NUM, hw); |
| @@ -456,7 +456,7 @@ int sum_mgr_create(void *hw, struct sum_mgr **rsum_mgr) | |||
| 456 | 456 | ||
| 457 | *rsum_mgr = NULL; | 457 | *rsum_mgr = NULL; |
| 458 | sum_mgr = kzalloc(sizeof(*sum_mgr), GFP_KERNEL); | 458 | sum_mgr = kzalloc(sizeof(*sum_mgr), GFP_KERNEL); |
| 459 | if (NULL == sum_mgr) | 459 | if (!sum_mgr) |
| 460 | return -ENOMEM; | 460 | return -ENOMEM; |
| 461 | 461 | ||
| 462 | err = rsc_mgr_init(&sum_mgr->mgr, SUM, SUM_RESOURCE_NUM, hw); | 462 | err = rsc_mgr_init(&sum_mgr->mgr, SUM, SUM_RESOURCE_NUM, hw); |
