diff options
Diffstat (limited to 'sound/pci/asihpi/hpi6000.c')
-rw-r--r-- | sound/pci/asihpi/hpi6000.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c index df4aed5295d..3cc6f11c20a 100644 --- a/sound/pci/asihpi/hpi6000.c +++ b/sound/pci/asihpi/hpi6000.c | |||
@@ -359,7 +359,7 @@ void HPI_6000(struct hpi_message *phm, struct hpi_response *phr) | |||
359 | HPI_ERROR_PROCESSING_MESSAGE); | 359 | HPI_ERROR_PROCESSING_MESSAGE); |
360 | 360 | ||
361 | switch (phm->type) { | 361 | switch (phm->type) { |
362 | case HPI_TYPE_MESSAGE: | 362 | case HPI_TYPE_REQUEST: |
363 | switch (phm->object) { | 363 | switch (phm->object) { |
364 | case HPI_OBJ_SUBSYSTEM: | 364 | case HPI_OBJ_SUBSYSTEM: |
365 | subsys_message(phm, phr); | 365 | subsys_message(phm, phr); |
@@ -538,7 +538,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao, | |||
538 | 538 | ||
539 | HPI_DEBUG_LOG(VERBOSE, "send ADAPTER_GET_INFO\n"); | 539 | HPI_DEBUG_LOG(VERBOSE, "send ADAPTER_GET_INFO\n"); |
540 | memset(&hm, 0, sizeof(hm)); | 540 | memset(&hm, 0, sizeof(hm)); |
541 | hm.type = HPI_TYPE_MESSAGE; | 541 | hm.type = HPI_TYPE_REQUEST; |
542 | hm.size = sizeof(struct hpi_message); | 542 | hm.size = sizeof(struct hpi_message); |
543 | hm.object = HPI_OBJ_ADAPTER; | 543 | hm.object = HPI_OBJ_ADAPTER; |
544 | hm.function = HPI_ADAPTER_GET_INFO; | 544 | hm.function = HPI_ADAPTER_GET_INFO; |
@@ -946,11 +946,8 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, | |||
946 | } | 946 | } |
947 | 947 | ||
948 | /* write the DSP code down into the DSPs memory */ | 948 | /* write the DSP code down into the DSPs memory */ |
949 | /*HpiDspCode_Open(nBootLoadFamily,&DspCode,pdwOsErrorCode); */ | 949 | error = hpi_dsp_code_open(boot_load_family, pao->pci.pci_dev, |
950 | dsp_code.ps_dev = pao->pci.pci_dev; | 950 | &dsp_code, pos_error_code); |
951 | |||
952 | error = hpi_dsp_code_open(boot_load_family, &dsp_code, | ||
953 | pos_error_code); | ||
954 | 951 | ||
955 | if (error) | 952 | if (error) |
956 | return error; | 953 | return error; |