summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorEliot Blennerhassett <eliot@blennerhassett.gen.nz>2014-11-20 04:22:56 +0100
committerTakashi Iwai <tiwai@suse.de>2014-11-22 22:33:48 +0100
commitdc612838eac746b11bb4e5d923dafeea0ba7e81b (patch)
treee5b9b53ad9346cd6a23298ad75435e400a0e5bb7 /sound/pci
parentALSA: asihpi: Use standard printk helpers (diff)
downloadlinux-dc612838eac746b11bb4e5d923dafeea0ba7e81b.tar.xz
linux-dc612838eac746b11bb4e5d923dafeea0ba7e81b.zip
ALSA: asihpi: don't fail probe if adapter mode read fails
Only determining if low latency mode is enabled. Failure indicates adapter has no modes Signed-off-by: Eliot Blennerhassett <eliot@blennerhassett.gen.nz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/asihpi/hpioctl.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index 9454932fc9c0..e457eb80658b 100644
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -424,14 +424,13 @@ int asihpi_adapter_probe(struct pci_dev *pci_dev,
hm.adapter_index = adapter.adapter->index;
hpi_send_recv_ex(&hm, &hr, HOWNER_KERNEL);
- if (hr.error) {
- HPI_DEBUG_LOG(ERROR,
- "HPI_ADAPTER_GET_MODE failed, aborting\n");
- goto err;
- }
-
- if (hr.u.ax.mode.adapter_mode == HPI_ADAPTER_MODE_LOW_LATENCY)
+ if (!hr.error
+ && hr.u.ax.mode.adapter_mode == HPI_ADAPTER_MODE_LOW_LATENCY)
low_latency_mode = 1;
+ else
+ dev_info(&pci_dev->dev,
+ "Adapter at index %d is not in low latency mode\n",
+ adapter.adapter->index);
/* Check if IRQs are supported */
hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,