set_interrupt goto ok, renamed chip_set to chipset in option to gpio_…

…server:start_link
Feuerlabs · Apr 25, 2013 · c247ae5 · c247ae5
1 parent 58b4550
commit c247ae5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/c_src/gpio_drv.c b/c_src/gpio_drv.c
@@ -1363,8 +1363,8 @@ static ErlDrvSSizeT gpio_drv_ctl(ErlDrvData d,
 		goto error;
 	    gp->interrupt = intval;
 	    gp->target = driver_caller(ctx->port);
-	    goto ok;
 	}
+	goto ok;
     }
 
     case CMD_GET_INTERRUPT: {
@@ -1387,13 +1387,13 @@ static ErlDrvSSizeT gpio_drv_ctl(ErlDrvData d,
 	if (len != 1) goto badarg;
 	gpio_debug_level = get_int8(buf);
 	DEBUGF("Debug level set to %d", gpio_debug_level);
-	goto ok;
+	goto oki;
     }
 
     case CMD_DUMP: {
 	if (len != 0) goto badarg;
 	dump(ctx);
-	goto ok;
+	goto oki;
     }
 
     default:
@@ -1402,6 +1402,7 @@ static ErlDrvSSizeT gpio_drv_ctl(ErlDrvData d,
 
 ok:
     DEBUGF("Successfully executed %d on pin %d:%d", cmd, pin_reg, pin);
+oki:
     return ctl_reply(0, NULL, 0, rbuf, rsize);
 badarg:
     gpio_errno = EINVAL;

diff --git a/src/gpio_server.erl b/src/gpio_server.erl
@@ -82,7 +82,7 @@ init(Options) ->
 		 end,
 
 	    %% Add more chipsets when available
-	    CS = case proplists:get_value(chip_set, Options, false) of
+	    CS = case proplists:get_value(chipset, Options, false) of
 		     false -> "";
 		     bcm2835 -> " b";
 		     Other ->