Index: uspace/drv/block/usbmast/bo_trans.c
===================================================================
--- uspace/drv/block/usbmast/bo_trans.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/drv/block/usbmast/bo_trans.c	(revision 8800b13065d75eefbc778f2b003bc4253f57fc29)
@@ -116,5 +116,5 @@
 		usb_pipe_clear_halt(
 		    usb_device_get_default_pipe(mfun->mdev->usb_dev), dpipe);
-        } else if (rc != EOK) {
+	} else if (rc != EOK) {
 		usb_log_error("Failed to transfer data: %s", str_error(rc));
 		return EIO;
@@ -141,5 +141,5 @@
 	if (csw.dCSWTag != tag) {
 		usb_log_error("Received CSW with incorrect tag. (expected: %"
-		    PRIX32" received: %"PRIx32, tag, csw.dCSWTag);
+		    PRIX32 " received: %" PRIx32, tag, csw.dCSWTag);
 		return EIO;
 	}
Index: uspace/drv/block/usbmast/main.c
===================================================================
--- uspace/drv/block/usbmast/main.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/drv/block/usbmast/main.c	(revision 8800b13065d75eefbc778f2b003bc4253f57fc29)
@@ -179,5 +179,5 @@
 	usb_log_debug("Get LUN count...");
 	mdev->lun_count = usb_masstor_get_lun_count(mdev);
-	mdev->luns = calloc(mdev->lun_count, sizeof(ddf_fun_t*));
+	mdev->luns = calloc(mdev->lun_count, sizeof(ddf_fun_t *));
 	if (mdev->luns == NULL) {
 		usb_log_error("Failed allocating luns table.");
Index: uspace/drv/block/usbmast/scsi_ms.c
===================================================================
--- uspace/drv/block/usbmast/scsi_ms.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/drv/block/usbmast/scsi_ms.c	(revision 8800b13065d75eefbc778f2b003bc4253f57fc29)
@@ -196,5 +196,5 @@
 	if (cmd.rcvd_size < SCSI_STD_INQUIRY_DATA_MIN_SIZE) {
 		usb_log_error("SCSI Inquiry response too short (%zu).",
-		     cmd.rcvd_size);
+		    cmd.rcvd_size);
 		return EIO;
 	}
@@ -306,5 +306,5 @@
 	if (cmd.rcvd_size < sizeof(data)) {
 		usb_log_error("SCSI Read Capacity response too short (%zu).",
-		     cmd.rcvd_size);
+		    cmd.rcvd_size);
 		return EIO;
 	}
@@ -349,5 +349,5 @@
 	rc = usbmast_run_cmd(mfun, &cmd);
 
-        if (rc != EOK) {
+	if (rc != EOK) {
 		usb_log_error("Read (10) transport failed, device %s: %s.",
 		    usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));