From a4f7293f3201c41dbbd04a3e4433b510871f2926 Mon Sep 17 00:00:00 2001 From: Vincent Huang Date: Fri, 21 Aug 2020 17:42:00 +0800 Subject: [PATCH] synaptics: retry get version command once when receiving non-success status --- libfprint/drivers/synaptics/synaptics.c | 63 ++++++++++++++----------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c index 9fde846..9bbae99 100644 --- a/libfprint/drivers/synaptics/synaptics.c +++ b/libfprint/drivers/synaptics/synaptics.c @@ -898,6 +898,7 @@ dev_probe (FpDevice *device) const guint8 *data; gboolean read_ok = TRUE; g_autofree gchar *serial = NULL; + gboolean retry = TRUE; G_DEBUG_HERE (); @@ -915,35 +916,43 @@ dev_probe (FpDevice *device) if (!g_usb_device_claim_interface (usb_dev, 0, 0, &error)) goto err_close; - /* TODO: Do not do this synchronous. */ - transfer = fpi_usb_transfer_new (device); - fpi_usb_transfer_fill_bulk (transfer, USB_EP_REQUEST, SENSOR_FW_CMD_HEADER_LEN); - transfer->short_is_error = TRUE; - transfer->buffer[0] = SENSOR_CMD_GET_VERSION; - if (!fpi_usb_transfer_submit_sync (transfer, 1000, &error)) - goto err_close; - - g_clear_pointer (&transfer, fpi_usb_transfer_unref); - transfer = fpi_usb_transfer_new (device); - fpi_usb_transfer_fill_bulk (transfer, USB_EP_REPLY, 40); - if (!fpi_usb_transfer_submit_sync (transfer, 1000, &error)) - goto err_close; - - fpi_byte_reader_init (&reader, transfer->buffer, transfer->actual_length); - - if (!fpi_byte_reader_get_uint16_le (&reader, &status)) + while(1) { - g_warning ("Transfer in response to version query was too short"); - error = fpi_device_error_new (FP_DEVICE_ERROR_PROTO); - goto err_close; - } - if (status != 0) - { - g_warning ("Device responded with error: %d", status); - error = fpi_device_error_new (FP_DEVICE_ERROR_PROTO); - goto err_close; - } + /* TODO: Do not do this synchronous. */ + transfer = fpi_usb_transfer_new (device); + fpi_usb_transfer_fill_bulk (transfer, USB_EP_REQUEST, SENSOR_FW_CMD_HEADER_LEN); + transfer->short_is_error = TRUE; + transfer->buffer[0] = SENSOR_CMD_GET_VERSION; + if (!fpi_usb_transfer_submit_sync (transfer, 1000, &error)) + goto err_close; + g_clear_pointer (&transfer, fpi_usb_transfer_unref); + transfer = fpi_usb_transfer_new (device); + fpi_usb_transfer_fill_bulk (transfer, USB_EP_REPLY, 40); + if (!fpi_usb_transfer_submit_sync (transfer, 1000, &error)) + goto err_close; + + fpi_byte_reader_init (&reader, transfer->buffer, transfer->actual_length); + + if (!fpi_byte_reader_get_uint16_le (&reader, &status)) + { + g_warning ("Transfer in response to version query was too short"); + error = fpi_device_error_new (FP_DEVICE_ERROR_PROTO); + goto err_close; + } + if (status != 0) + { + g_warning ("Device responded with error: %d retry: %d", status, retry); + if(retry) + { + retry = FALSE; + continue; + } + error = fpi_device_error_new (FP_DEVICE_ERROR_PROTO); + goto err_close; + } + break; + } read_ok &= fpi_byte_reader_get_uint32_le (&reader, &self->mis_version.build_time); read_ok &= fpi_byte_reader_get_uint32_le (&reader, &self->mis_version.build_num); read_ok &= fpi_byte_reader_get_uint8 (&reader, &self->mis_version.version_major);