make it possible to return an error everywhere

[usb-driver] / config.c

diff --git a/config.c b/config.c
index e09d5ca8989a96ffc50be23c7f5edb7ddb3f3658..a39902e99e8a04f683f398266f0cc13ffddc94e8 100644 (file)
--- a/config.c
+++ b/config.c
@@ -17,11 +17,14 @@ static struct parport_config pp_config[4];
 
 static void read_config() {
        int i;
-       int line, len, num;
        static int config_read = 0;
        FILE *cfg;
-       char buf[LINELEN], *pbuf;
+       char buf[LINELEN];
+#ifdef JTAGKEY
+       char *pbuf;
        unsigned short vid, pid;
+       int line, len, num;
+#endif
 
        if (config_read)
                return;
@@ -140,7 +143,7 @@ static void read_config() {
 
                                vid = 0;
                                vid = strtol(pbuf, NULL, 16);
-                               if (!num) {
+                               if (!vid) {
                                        PARSEERROR;
                                        continue;
                                }
@@ -155,7 +158,7 @@ static void read_config() {
 
                                pid = 0;
                                pid = strtol(pbuf, NULL, 16);
-                               if (!num) {
+                               if (!pid) {
                                        PARSEERROR;
                                        continue;
                                }