diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-18 07:39:08 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-18 07:39:08 +0100 |
| commit | d351cf4603edb2a5bfa9a48d06c425511c63f2a3 (patch) | |
| tree | b03ea3cfd3ca3974237563cf87328386c3d49ff1 /sound/pci/asihpi/hpimsginit.c | |
| parent | 433e8327caf9f7c0432b2f2f6684a5b79cfe18e9 (diff) | |
| parent | 4a122c10fbfe9020df469f0f669da129c5757671 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/asihpi/hpimsginit.c')
| -rw-r--r-- | sound/pci/asihpi/hpimsginit.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sound/pci/asihpi/hpimsginit.c b/sound/pci/asihpi/hpimsginit.c index 8e1d099ed7e..628376ce4a4 100644 --- a/sound/pci/asihpi/hpimsginit.c +++ b/sound/pci/asihpi/hpimsginit.c @@ -32,21 +32,6 @@ static u16 res_size[HPI_OBJ_MAXINDEX + 1] = HPI_RESPONSE_SIZE_BY_OBJECT; static u16 gwSSX2_bypass; /** \internal - * Used by ASIO driver to disable SSX2 for a single process - * \param phSubSys Pointer to HPI subsystem handle. - * \param wBypass New bypass setting 0 = off, nonzero = on - * \return Previous bypass setting. - */ -u16 hpi_subsys_ssx2_bypass(const struct hpi_hsubsys *ph_subsys, u16 bypass) -{ - u16 old_value = gwSSX2_bypass; - - gwSSX2_bypass = bypass; - - return old_value; -} - -/** \internal * initialize the HPI message structure */ static void hpi_init_message(struct hpi_message *phm, u16 object, @@ -65,7 +50,8 @@ static void hpi_init_message(struct hpi_message *phm, u16 object, phm->object = object; phm->function = function; phm->version = 0; - /* Expect adapter index to be set by caller */ + phm->adapter_index = HPI_ADAPTER_INDEX_INVALID; + /* Expect actual adapter index to be set by caller */ } /** \internal |