aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/asihpi/hpi6205.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/asihpi/hpi6205.c')
-rw-r--r--sound/pci/asihpi/hpi6205.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
index 95d1cd5804c0..e3d0f55ad6c4 100644
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -488,7 +488,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
488 return; 488 return;
489 } 489 }
490 490
491 phr->u.s.adapter_type = ao.adapter_type; 491 phr->u.s.adapter_type = ao.type;
492 phr->u.s.adapter_index = ao.index; 492 phr->u.s.adapter_index = ao.index;
493 phr->error = 0; 493 phr->error = 0;
494} 494}
@@ -503,7 +503,7 @@ static void adapter_delete(struct hpi_adapter_obj *pao,
503 phr->error = HPI_ERROR_INVALID_OBJ_INDEX; 503 phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
504 return; 504 return;
505 } 505 }
506 phw = (struct hpi_hw_obj *)pao->priv; 506 phw = pao->priv;
507 /* reset adapter h/w */ 507 /* reset adapter h/w */
508 /* Reset C6713 #1 */ 508 /* Reset C6713 #1 */
509 boot_loader_write_mem32(pao, 0, C6205_BAR0_TIMER1_CTL, 0); 509 boot_loader_write_mem32(pao, 0, C6205_BAR0_TIMER1_CTL, 0);
@@ -652,7 +652,7 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
652 if (hr.error) 652 if (hr.error)
653 return hr.error; 653 return hr.error;
654 654
655 pao->adapter_type = hr.u.ax.info.adapter_type; 655 pao->type = hr.u.ax.info.adapter_type;
656 pao->index = hr.u.ax.info.adapter_index; 656 pao->index = hr.u.ax.info.adapter_index;
657 657
658 max_streams = 658 max_streams =
@@ -665,8 +665,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
665 hr.u.ax.info.serial_number); 665 hr.u.ax.info.serial_number);
666 } 666 }
667 667
668 pao->open = 0; /* upon creation the adapter is closed */
669
670 if (phw->p_cache) 668 if (phw->p_cache)
671 phw->p_cache->adap_idx = pao->index; 669 phw->p_cache->adap_idx = pao->index;
672 670