Changes in uspace/drv/block/usbmast/bo_trans.c [d5c1051:a1732929] in mainline

File:

• uspace/drv/block/usbmast/bo_trans.c (modified) (5 diffs)

uspace/drv/block/usbmast/bo_trans.c

@@ -90 +90 @@
             str_error(rc));
         if (rc != EOK) {
-                usb_log_error("Bulk out write failed: %s\n", str_error(rc));
+                usb_log_error("Bulk out write failed: %s", str_error(rc));
                 return EIO;
         }
@@ -154 +154 @@
         case cbs_failed:
                 cmd->status = CMDS_FAILED;
-                usb_log_error("CBS Failed.\n");
+                usb_log_error("CBS Failed.");
                 break;
         case cbs_phase_error:
-                usb_log_error("CBS phase error.\n");
+                usb_log_error("CBS phase error.");
                 rc = EIO;
                 break;
         default:
-                usb_log_error("CBS other error.\n");
+                usb_log_error("CBS other error.");
                 rc = EIO;
                 break;
@@ -168 +168 @@
         const size_t residue = uint32_usb2host(csw.dCSWDataResidue);
         if (residue > dbuf_size) {
-                usb_log_error("Residue > buffer size (%zu > %zu).\n",
+                usb_log_error("Residue > buffer size (%zu > %zu).",
                     residue, dbuf_size);
                 return EIO;
@@ -228 +228 @@
  *
  * @param mfun          Mass storage function
- * @return              Maximum LUN (index, not count), or -1
+ * @return              Error code of maximum LUN (index, not count)
  */
 int usb_massstor_get_max_lun(usbmast_dev_t *mdev)
@@ -240 +240 @@
             &data_recv_len);
         if (rc != EOK) {
-                return -1;
+                return rc;
         }
         if (data_recv_len != 1) {
-                return -1;
-        }
-        return max_lun;
+                return EEMPTY;
+        }
+        return (int) max_lun;
 }