Index: uspace/app/usbinfo/info.c
===================================================================
--- uspace/app/usbinfo/info.c	(revision 7363fc1269036e1480c17d10b371b5ec1de778fe)
+++ uspace/app/usbinfo/info.c	(revision 7d2046152a8b44545f4f4cbedd5dcf175eeffdf2)
@@ -354,43 +354,33 @@
 {
 	int rc;
-	uint16_t device_status = 0;
-	uint16_t ctrl_pipe_status = 0;
+	uint16_t status = 0;
 
 	/* Device status first. */
 	rc = usb_request_get_status(&dev->ctrl_pipe,
-	    USB_REQUEST_RECIPIENT_DEVICE, 0,
-	    &device_status);
+	    USB_REQUEST_RECIPIENT_DEVICE, 0, &status);
 	if (rc != EOK) {
 		printf("%sFailed to get device status: %s.\n",
 		    get_indent(0), str_error(rc));
-		goto try_ctrl_pipe_status;
-	}
-
-	printf("%sDevice status 0x%04x: power=%s, remote-wakeup=%s.\n",
-	    get_indent(0),
-	    device_status,
-	    device_status & USB_DEVICE_STATUS_SELF_POWERED ? "self" : "bus",
-	    device_status & USB_DEVICE_STATUS_REMOTE_WAKEUP ? "yes" : "no");
+	} else {
+		printf("%sDevice status 0x%04x: power=%s, remote-wakeup=%s.\n",
+		    get_indent(0), status,
+		    status & USB_DEVICE_STATUS_SELF_POWERED ? "self" : "bus",
+		    status & USB_DEVICE_STATUS_REMOTE_WAKEUP ? "yes" : "no");
+	}
 
 	/* Interface is not interesting, skipping ;-). */
 
 	/* Control endpoint zero. */
-try_ctrl_pipe_status:
+	status = 0;
 	rc = usb_request_get_status(&dev->ctrl_pipe,
-	    USB_REQUEST_RECIPIENT_ENDPOINT, 0,
-	    &ctrl_pipe_status);
+	    USB_REQUEST_RECIPIENT_ENDPOINT, 0, &status);
 	if (rc != EOK) {
 		printf("%sFailed to get control endpoint status: %s.\n",
 		    get_indent(0), str_error(rc));
-		goto leave;
-	}
-
-	printf("%sControl endpoint zero status %04X: halted=%s.\n",
-	    get_indent(0),
-	    ctrl_pipe_status,
-	    ctrl_pipe_status & USB_ENDPOINT_STATUS_HALTED ? "yes" : "no");
-
-leave:
-	return;
+	} else {
+		printf("%sControl endpoint zero status %04X: halted=%s.\n",
+		    get_indent(0), status,
+		    status & USB_ENDPOINT_STATUS_HALTED ? "yes" : "no");
+	}
 }