OSDN Git Service

ALSA: asihpi: don't fail probe if adapter mode read fails
authorEliot Blennerhassett <eliot@blennerhassett.gen.nz>
Thu, 20 Nov 2014 03:22:56 +0000 (16:22 +1300)
committerTakashi Iwai <tiwai@suse.de>
Sat, 22 Nov 2014 21:33:48 +0000 (22:33 +0100)
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>
sound/pci/asihpi/hpioctl.c

index 9454932..e457eb8 100644 (file)
@@ -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,