USB Storage, add meaningful return value

This patch changes the "usb storage" command to return success if it
finds a USB storage device, otherwise it returns error.

Signed-off-by: Markus Klotzbuecher <mk@denx.de>

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index c6b17c2ab7ad2af8d74ac4ce4c55c63e07f60dac..ad3240708b014464ee6d28334957f54f59156237 100644 (file)
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -529,8 +529,7 @@ int do_usb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 
        if (strncmp(argv[1], "stor", 4) == 0) {
-               usb_stor_info();
-               return 0;
+               return usb_stor_info();
        }
 
        if (strncmp(argv[1],"part",4) == 0) {

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 443d78574abcef38671e7453f001b490ac62c56b..81d2f92100eb54686f9a3f030ca7f851b4ff8fc5 100644 (file)
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -188,17 +188,20 @@ void usb_show_progress(void)
  * show info on storage devices; 'usb start/init' must be invoked earlier
  * as we only retrieve structures populated during devices initialization
  */
-void usb_stor_info(void)
+int usb_stor_info(void)
 {
        int i;
 
-       if (usb_max_devs > 0)
+       if (usb_max_devs > 0) {
                for (i = 0; i < usb_max_devs; i++) {
                        printf ("  Device %d: ", i);
                        dev_print(&usb_dev_desc[i]);
+                       return 0;
                }
-       else
+       } else {
                printf("No storage devices, perhaps not 'usb start'ed..?\n");
+               return 1;
+       }
 }
 
 /*********************************************************************************