summaryrefslogtreecommitdiffstats
path: root/sound/pci/asihpi/hpimsginit.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-07-25 10:22:29 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-07-25 10:22:29 +0200
commitb79b3e05b1229d5b2fc2af71dc29701642577eba (patch)
treebcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /sound/pci/asihpi/hpimsginit.c
parentARM: static should be at beginning of declaration (diff)
parentARM: mach-shmobile: ag5evm: SDHI requires waiting for idle (diff)
downloadlinux-b79b3e05b1229d5b2fc2af71dc29701642577eba.tar.xz
linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.zip
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'sound/pci/asihpi/hpimsginit.c')
-rw-r--r--sound/pci/asihpi/hpimsginit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/asihpi/hpimsginit.c b/sound/pci/asihpi/hpimsginit.c
index 628376ce4a49..52400a6b5f15 100644
--- a/sound/pci/asihpi/hpimsginit.c
+++ b/sound/pci/asihpi/hpimsginit.c
@@ -46,7 +46,7 @@ static void hpi_init_message(struct hpi_message *phm, u16 object,
if (gwSSX2_bypass)
phm->type = HPI_TYPE_SSX2BYPASS_MESSAGE;
else
- phm->type = HPI_TYPE_MESSAGE;
+ phm->type = HPI_TYPE_REQUEST;
phm->object = object;
phm->function = function;
phm->version = 0;
@@ -89,7 +89,7 @@ static void hpi_init_messageV1(struct hpi_message_header *phm, u16 size,
memset(phm, 0, sizeof(*phm));
if ((object > 0) && (object <= HPI_OBJ_MAXINDEX)) {
phm->size = size;
- phm->type = HPI_TYPE_MESSAGE;
+ phm->type = HPI_TYPE_REQUEST;
phm->object = object;
phm->function = function;
phm->version = 1;