aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/asihpi
diff options
context:
space:
mode:
authorEliot Blennerhassett <eliot@blennerhassett.gen.nz>2014-11-19 22:22:56 -0500
committerTakashi Iwai <tiwai@suse.de>2014-11-22 16:33:48 -0500
commitdc612838eac746b11bb4e5d923dafeea0ba7e81b (patch)
treee5b9b53ad9346cd6a23298ad75435e400a0e5bb7 /sound/pci/asihpi
parent12eb0898741870882ca474708e811983d5a5d768 (diff)
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/asihpi')
-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,
424 hm.adapter_index = adapter.adapter->index; 424 hm.adapter_index = adapter.adapter->index;
425 hpi_send_recv_ex(&hm, &hr, HOWNER_KERNEL); 425 hpi_send_recv_ex(&hm, &hr, HOWNER_KERNEL);
426 426
427 if (hr.error) { 427 if (!hr.error
428 HPI_DEBUG_LOG(ERROR, 428 && hr.u.ax.mode.adapter_mode == HPI_ADAPTER_MODE_LOW_LATENCY)
429 "HPI_ADAPTER_GET_MODE failed, aborting\n");
430 goto err;
431 }
432
433 if (hr.u.ax.mode.adapter_mode == HPI_ADAPTER_MODE_LOW_LATENCY)
434 low_latency_mode = 1; 429 low_latency_mode = 1;
430 else
431 dev_info(&pci_dev->dev,
432 "Adapter at index %d is not in low latency mode\n",
433 adapter.adapter->index);
435 434
436 /* Check if IRQs are supported */ 435 /* Check if IRQs are supported */
437 hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER, 436 hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,