depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

upeksonly: Fix creation of image transfers

Browse source 
The GPtrArray needs to be created at some point. Also, reference
counting was wrong as submitting the transfer sinks the ref, but we rely
on it surviving.

Note that we really should change this to only have one in-flight
transfer and starting a new one after it finishes.

Co-authored-by: Vasily Khoruzhick <anarsoul@gmail.com>
This commit is contained in:
Benjamin Berg 2020-06-02 12:05:23 +02:00 committed by Benjamin Berg
parent 6633025437
commit 60d0f84294
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libfprint/drivers/upeksonly.c
View file

@ -560,7 +560,7 @@ img_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
if (is_capturing (self)) if (is_capturing (self))
{ {
fpi_usb_transfer_submit (transfer, fpi_usb_transfer_submit (fpi_usb_transfer_ref (transfer),
0, 0,
self->img_cancellable, self->img_cancellable,
img_data_cb, img_data_cb,
@ -908,7 +908,7 @@ capsm_fire_bulk (FpiSsm *ssm,
self->img_cancellable = g_cancellable_new (); self->img_cancellable = g_cancellable_new ();
for (i = 0; i < self->img_transfers->len; i++) for (i = 0; i < self->img_transfers->len; i++)
{ {
fpi_usb_transfer_submit (g_ptr_array_index (self->img_transfers, i), fpi_usb_transfer_submit (fpi_usb_transfer_ref (g_ptr_array_index (self->img_transfers, i)),
0, 0,
self->img_cancellable, self->img_cancellable,
img_data_cb, img_data_cb,
@ -1406,8 +1406,9 @@ dev_activate (FpImageDevice *dev)
self->capturing = FALSE; self->capturing = FALSE;
self->num_flying = 0; self->num_flying = 0;
self->img_transfers = g_ptr_array_new_with_free_func ((GFreeFunc) fpi_usb_transfer_unref);
for (i = 0; i < self->img_transfers->len; i++) for (i = 0; i < NUM_BULK_TRANSFERS; i++)
{ {
FpiUsbTransfer *transfer; FpiUsbTransfer *transfer;