Index: uspace/drv/bus/usb/usbmast/bo_trans.h
===================================================================
--- uspace/drv/bus/usb/usbmast/bo_trans.h	(revision c53b58e933d3da92e0e4a3461e7e13f4a3d81fb8)
+++ uspace/drv/bus/usb/usbmast/bo_trans.h	(revision 83062ff8292bffee7c9c450eb0582a1a149db182)
@@ -60,5 +60,5 @@
 
 	/** Command Descriptor Block */
-	void *cdb;
+	const void *cdb;
 	/** CDB size in bytes */
 	size_t cdb_size;
Index: uspace/drv/bus/usb/usbmast/scsi_ms.c
===================================================================
--- uspace/drv/bus/usb/usbmast/scsi_ms.c	(revision c53b58e933d3da92e0e4a3461e7e13f4a3d81fb8)
+++ uspace/drv/bus/usb/usbmast/scsi_ms.c	(revision 83062ff8292bffee7c9c450eb0582a1a149db182)
@@ -394,8 +394,4 @@
 int usbmast_sync_cache(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks)
 {
-	scsi_cmd_t cmd;
-	scsi_cdb_sync_cache_10_t cdb;
-	int rc;
-
 	if (ba > UINT32_MAX)
 		return ELIMIT;
@@ -404,14 +400,16 @@
 		return ELIMIT;
 
-	memset(&cdb, 0, sizeof(cdb));
-	cdb.op_code = SCSI_CMD_SYNC_CACHE_10;
-	cdb.lba = host2uint32_t_be(ba);
-	cdb.numlb = host2uint16_t_be(nblocks);
-
-	memset(&cmd, 0, sizeof(cmd));
-	cmd.cdb = &cdb;
-	cmd.cdb_size = sizeof(cdb);
-
-	rc = usbmast_run_cmd(mfun, &cmd);
+	const scsi_cdb_sync_cache_10_t cdb = {
+		.op_code = SCSI_CMD_SYNC_CACHE_10,
+		.lba = host2uint32_t_be(ba),
+		.numlb = host2uint16_t_be(nblocks),
+	};
+
+	scsi_cmd_t cmd = {
+		.cdb = &cdb,
+		.cdb_size = sizeof(cdb),
+	};
+
+	const int rc = usbmast_run_cmd(mfun, &cmd);
 
         if (rc != EOK) {