X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fulink.c;h=cfd693a60ebbb3551854c4bfbe0d4ad64f781735;hb=e971c7f4238030a362d3f17c4e519b402b3166cd;hp=d93150d641e1d24fef071d77f2eaa1c933de0aef;hpb=517ba0690dcc9e859a05df2113ce32401a5ab254;p=openocd.git

diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c
index d93150d641..cfd693a60e 100644
--- a/src/jtag/drivers/ulink.c
+++ b/src/jtag/drivers/ulink.c
@@ -26,7 +26,7 @@
 #include <jtag/interface.h>
 #include <jtag/commands.h>
 #include <target/image.h>
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 #include "OpenULINK/include/msgtypes.h"
 
 /** USB Vendor ID of ULINK device in unconfigured state (no firmware loaded
@@ -461,9 +461,6 @@ int ulink_write_firmware_section(struct ulink *device,
 	LOG_DEBUG("section %02i at addr 0x%04x (size 0x%04x)", section_index, addr,
 		size);
 
-	if (data == NULL)
-		return ERROR_FAIL;
-
 	/* Copy section contents to local buffer */
 	ret = image_read_section(firmware_image, section_index, 0, size, data,
 			&size_read);