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

lib: Remove drv->close absence support in fp_async_dev_close()

Browse source 
The driver will at least need to close its hardware resources, and
free memory, so it must have had one.

This case was never actually used as can be seen from the fact that
we would assert in fpi_drvcb_close_complete() if the state was wrong
but never set it to the expected value.
This commit is contained in:
Bastien Nocera 2018-05-31 10:56:46 +02:00
parent b3f6ff5a36
commit c91819f551
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libfprint/async.c
View file

@ -114,18 +114,14 @@ API_EXPORTED void fp_async_dev_close(struct fp_dev *dev,
drv = dev->drv; drv = dev->drv;
g_return_if_fail (drv->close != NULL);
if (g_slist_index(opened_devices, (gconstpointer) dev) == -1) if (g_slist_index(opened_devices, (gconstpointer) dev) == -1)
fp_err("device %p not in opened list!", dev); fp_err("device %p not in opened list!", dev);
opened_devices = g_slist_remove(opened_devices, (gconstpointer) dev); opened_devices = g_slist_remove(opened_devices, (gconstpointer) dev);
dev->close_cb = callback; dev->close_cb = callback;
dev->close_cb_data = user_data; dev->close_cb_data = user_data;
if (!drv->close) {
fpi_drvcb_close_complete(dev);
return;
}
dev->state = DEV_STATE_DEINITIALIZING; dev->state = DEV_STATE_DEINITIALIZING;
drv->close(dev); drv->close(dev);
} }