iiod-client: Use fallback client to destroy blocks and buffers

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
analogdevicesinc · Jan 23, 2024 · d43c4a8 · d43c4a8
1 parent 7b973b5
commit d43c4a8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/iiod-client.c b/iiod-client.c
@@ -48,6 +48,7 @@ static int iiod_client_enable_binary(struct iiod_client *client);
 
 struct iiod_client_buffer_pdata {
 	struct iiod_client *client;
+	struct iiod_client *client_fb;
 	struct iiod_client_io *io;
 
 	struct iio_channels_mask *mask;
@@ -1430,6 +1431,7 @@ ssize_t iiod_client_writebuf(struct iiod_client_buffer_pdata *pdata,
 
 struct iiod_client_buffer_pdata *
 iiod_client_create_buffer(struct iiod_client *client,
+			  struct iiod_client *client_fb,
 			  const struct iio_device *dev, unsigned int idx,
 			  struct iio_channels_mask *mask)
 {
@@ -1446,6 +1448,7 @@ iiod_client_create_buffer(struct iiod_client *client,
 	pdata->dev = dev;
 	pdata->idx = (uint16_t) idx;
 	pdata->client = client;
+	pdata->client_fb = client_fb;
 	pdata->mask = mask;
 
 	if (iiod_client_uses_binary_interface(client)) {
@@ -1473,7 +1476,7 @@ iiod_client_create_buffer(struct iiod_client *client,
 
 void iiod_client_free_buffer(struct iiod_client_buffer_pdata *pdata)
 {
-	struct iiod_client *client = pdata->client;
+	struct iiod_client *client = pdata->client_fb;
 	struct iiod_io *io;
 	struct iiod_command cmd;
 
@@ -1597,7 +1600,7 @@ iiod_client_create_block(struct iiod_client_buffer_pdata *pdata,
 
 void iiod_client_free_block(struct iio_block_pdata *block)
 {
-	struct iiod_client *client = block->buffer->client;
+	struct iiod_client *client = block->buffer->client_fb;
 	struct iiod_io *io;
 	struct iiod_client_buffer_pdata *pdata = block->buffer;
 	struct iiod_command cmd;

diff --git a/include/iio/iiod-client.h b/include/iio/iiod-client.h
@@ -73,6 +73,7 @@ iiod_client_create_context(struct iiod_client *client,
 
 __api struct iiod_client_buffer_pdata *
 iiod_client_create_buffer(struct iiod_client *client,
+			  struct iiod_client *client_fb,
 			  const struct iio_device *dev, unsigned int idx,
 			  struct iio_channels_mask *mask);
 __api void iiod_client_free_buffer(struct iiod_client_buffer_pdata *pdata);

diff --git a/network.c b/network.c
@@ -459,8 +459,9 @@ network_create_buffer(const struct iio_device *dev, unsigned int idx,
 		goto err_free_buf;
 	}
 
-	buf->pdata = iiod_client_create_buffer(buf->iiod_client, dev,
-					       idx, mask);
+	buf->pdata = iiod_client_create_buffer(buf->iiod_client,
+					       pdata->iiod_client,
+					       dev, idx, mask);
 	ret = iio_err(buf->pdata);
 	if (ret) {
 		dev_perror(dev, ret, "Unable to create buffer");

diff --git a/serial.c b/serial.c
@@ -239,6 +239,7 @@ serial_create_buffer(const struct iio_device *dev, unsigned int idx,
 		return iio_ptr(-ENOMEM);
 
 	buf->pdata = iiod_client_create_buffer(pdata->iiod_client,
+					       pdata->iiod_client,
 					       dev, idx, mask);
 	ret = iio_err(buf->pdata);
 	if (ret) {

diff --git a/usb.c b/usb.c
@@ -445,6 +445,7 @@ usb_create_buffer(const struct iio_device *dev, unsigned int idx,
 	}
 
 	buf->pdata = iiod_client_create_buffer(buf->io_ctx.iiod_client,
+					       ctx_pdata->io_ctx.iiod_client,
 					       dev, idx, mask);
 	ret = iio_err(buf->pdata);
 	if (ret) {