diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-08-12 09:55:01 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-08-12 09:55:10 +0300 |
| commit | 73b383141d296c55bfbc0ce336a4a946627e7780 (patch) | |
| tree | df0840c4ea4bbd5aa453931a594936bd9adab61d /sound/pci/asihpi/hpi6205.c | |
| parent | 627661ced8246c8e833f3bc3817070e934cd79ba (diff) | |
| parent | 91c6e15efc1756b068dc6e945c1626397e60a119 (diff) | |
| download | linux-73b383141d296c55bfbc0ce336a4a946627e7780.tar.xz | |
Merge branch 'for-next' into for-linus
Preparation for 4.19 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/asihpi/hpi6205.c')
| -rw-r--r-- | sound/pci/asihpi/hpi6205.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c index 8d5abfa4e24b..2864698436a5 100644 --- a/sound/pci/asihpi/hpi6205.c +++ b/sound/pci/asihpi/hpi6205.c @@ -635,7 +635,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao, { struct hpi_message hm; struct hpi_response hr; - u32 max_streams; HPI_DEBUG_LOG(VERBOSE, "init ADAPTER_GET_INFO\n"); memset(&hm, 0, sizeof(hm)); @@ -660,10 +659,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao, pao->type = hr.u.ax.info.adapter_type; pao->index = hr.u.ax.info.adapter_index; - max_streams = - hr.u.ax.info.num_outstreams + - hr.u.ax.info.num_instreams; - HPI_DEBUG_LOG(VERBOSE, "got adapter info type %x index %d serial %d\n", hr.u.ax.info.adapter_type, hr.u.ax.info.adapter_index, |