|
 |
73b847 |
From b5d9916157d5b215224ba799c1a2b707fd435554 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Thu, 28 Nov 2019 20:34:20 +0100
|
|
|
73b847 |
Subject: [PATCH 053/181] synaptics: Use an autoptr to handle the
|
|
|
73b847 |
FpiUsbTransfer sync transfers
|
|
|
73b847 |
|
|
|
73b847 |
When using fpi_usb_transfer_submit_sync we still need to unref the transfer
|
|
|
73b847 |
once done with it, so let's use an auto pointer so we free it also on
|
|
|
73b847 |
errors and early returns without having to handle this manually.
|
|
|
73b847 |
---
|
|
|
73b847 |
libfprint/drivers/synaptics/synaptics.c | 5 +++--
|
|
|
73b847 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
|
|
|
73b847 |
index ccaf60e..284973c 100644
|
|
|
73b847 |
--- a/libfprint/drivers/synaptics/synaptics.c
|
|
|
73b847 |
+++ b/libfprint/drivers/synaptics/synaptics.c
|
|
|
73b847 |
@@ -950,7 +950,8 @@ dev_probe (FpDevice *device)
|
|
|
73b847 |
{
|
|
|
73b847 |
FpiDeviceSynaptics *self = FPI_DEVICE_SYNAPTICS (device);
|
|
|
73b847 |
GUsbDevice *usb_dev;
|
|
|
73b847 |
- FpiUsbTransfer *transfer;
|
|
|
73b847 |
+
|
|
|
73b847 |
+ g_autoptr(FpiUsbTransfer) transfer = NULL;
|
|
|
73b847 |
FpiByteReader reader;
|
|
|
73b847 |
GError *error = NULL;
|
|
|
73b847 |
guint16 status;
|
|
|
73b847 |
@@ -985,7 +986,7 @@ dev_probe (FpDevice *device)
|
|
|
73b847 |
if (!fpi_usb_transfer_submit_sync (transfer, 1000, &error))
|
|
|
73b847 |
goto err_close;
|
|
|
73b847 |
|
|
|
73b847 |
-
|
|
|
73b847 |
+ g_clear_pointer (&transfer, fpi_usb_transfer_unref);
|
|
|
73b847 |
transfer = fpi_usb_transfer_new (device);
|
|
|
73b847 |
fpi_usb_transfer_fill_bulk (transfer, USB_EP_REPLY, 40);
|
|
|
73b847 |
if (!fpi_usb_transfer_submit_sync (transfer, 1000, &error))
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|