Index: sbin/camcontrol/camcontrol.c
===================================================================
--- sbin/camcontrol/camcontrol.c
+++ sbin/camcontrol/camcontrol.c
@@ -1909,14 +1909,16 @@
 }
 
 static void
-dump_data(uint16_t *ptr, uint32_t len)
+dump_data(char *ptr, size_t len)
 {
 	u_int i;
+	uint16_t x;
 
-	for (i = 0; i < len / 2; i++) {
+	for (i = 0; i < len / sizeof(x); i++) {
 		if ((i % 8) == 0)
 			printf(" %3d: ", i);
-		printf("%04hx ", ptr[i]);
+		memcpy(&x, &ptr[i * sizeof(x)], sizeof(x));
+		printf("%04hx ", x);
 		if ((i % 8) == 7)
 			printf("\n");
 	}