git://developer.intra2net.com
/
libftdi
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
a3886df
)
Check ftdi pointer before accessing it
author
Uwe Bonnes
<bon@elektron.ikp.physik.tu-darmstadt.de>
Tue, 1 Feb 2011 10:02:24 +0000 (11:02 +0100)
committer
Thomas Jarosch
<thomas.jarosch@intra2net.com>
Tue, 1 Feb 2011 12:21:55 +0000 (13:21 +0100)
src/ftdi.c
patch
|
blob
|
blame
|
history
diff --git
a/src/ftdi.c
b/src/ftdi.c
index
328a3e6
..
d4e09ff
100644
(file)
--- a/
src/ftdi.c
+++ b/
src/ftdi.c
@@
-617,12
+617,12
@@
int ftdi_usb_open_desc_index(struct ftdi_context *ftdi, int vendor, int product,
char string[256];
int i = 0;
- if (libusb_init(&ftdi->usb_ctx) < 0)
- ftdi_error_return(-11, "libusb_init() failed");
-
if (ftdi == NULL)
ftdi_error_return(-11, "ftdi context invalid");
+ if (libusb_init(&ftdi->usb_ctx) < 0)
+ ftdi_error_return(-11, "libusb_init() failed");
+
if (libusb_get_device_list(ftdi->usb_ctx, &devs) < 0)
ftdi_error_return(-12, "libusb_get_device_list() failed");