diff --git a/drivers/hwtracing/coresight/coresight-byte-cntr.c b/drivers/hwtracing/coresight/coresight-byte-cntr.c
index a928e48b7bc9..c9c9807fbd80 100644
--- a/drivers/hwtracing/coresight/coresight-byte-cntr.c
+++ b/drivers/hwtracing/coresight/coresight-byte-cntr.c
@@ -351,7 +351,8 @@ static int usb_transfer_small_packet(struct qdss_request *usb_req,
 		drvdata->usb_req = usb_req;
 		req_size -= actual;
 
-		if ((drvdata->offset + actual) >= tmcdrvdata->size)
+		if ((drvdata->offset + actual) >=
+				tmcdrvdata->etr_buf->size)
 			drvdata->offset = 0;
 		else
 			drvdata->offset += actual;
@@ -458,7 +459,7 @@ static void usb_read_work_fn(struct work_struct *work)
 					sg_mark_end(&usb_req->sg[i]);
 
 				if ((drvdata->offset + actual) >=
-					tmcdrvdata->size)
+					tmcdrvdata->etr_buf->size)
 					drvdata->offset = 0;
 				else
 					drvdata->offset += actual;