From f7cd712ff9324a19ae9040fd527ffb5b93b606eb Mon Sep 17 00:00:00 2001
From: Mike Walters <mike@flomp.net>
Date: Sun, 11 Sep 2016 15:52:29 +0100
Subject: [PATCH] Fix up frequency list size

---
 firmware/hackrf_usb/usb_api_sweep.c | 2 +-
 host/libhackrf/src/hackrf.c         | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/firmware/hackrf_usb/usb_api_sweep.c b/firmware/hackrf_usb/usb_api_sweep.c
index d2ee8ec5..1b4e40dc 100644
--- a/firmware/hackrf_usb/usb_api_sweep.c
+++ b/firmware/hackrf_usb/usb_api_sweep.c
@@ -45,7 +45,7 @@ usb_request_status_t usb_vendor_request_init_sweep(
 		usb_endpoint_t* const endpoint, const usb_transfer_stage_t stage)
 {
 	if (stage == USB_TRANSFER_STAGE_SETUP) {
-		frequency_count = endpoint->setup.length;
+		frequency_count = endpoint->setup.length / sizeof(uint16_t);
 		usb_transfer_schedule_block(endpoint->out, &frequencies,
 									endpoint->setup.length, NULL, NULL);
 	} else if (stage == USB_TRANSFER_STAGE_DATA) {
diff --git a/host/libhackrf/src/hackrf.c b/host/libhackrf/src/hackrf.c
index 59f0f2c6..539fd0a7 100644
--- a/host/libhackrf/src/hackrf.c
+++ b/host/libhackrf/src/hackrf.c
@@ -1702,6 +1702,7 @@ int ADDCALL hackrf_init_sweep(hackrf_device* device,
 							  int length)
 {
 	int result, i;
+	int size = length * sizeof(frequency_list[0]);
 
 	for(i=0; i<length; i++)
 		frequency_list[i] = TO_LE(frequency_list[i]);
@@ -1713,11 +1714,11 @@ int ADDCALL hackrf_init_sweep(hackrf_device* device,
 		0,
 		0,
 		(unsigned char*)frequency_list,
-		length,
+		size,
 		0
 	);
 
-	if (result < length) {
+	if (result < size) {
 		return HACKRF_ERROR_LIBUSB;
 	} else {
 		return HACKRF_SUCCESS;