]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
scsi: move the partition initialization out of the scsi detection
authorJean-Jacques Hiblot <jjhiblot@ti.com>
Fri, 7 Apr 2017 11:42:07 +0000 (13:42 +0200)
committerSimon Glass <sjg@chromium.org>
Sat, 15 Apr 2017 01:38:57 +0000 (19:38 -0600)
We might want to get information about the scsi device without initializing the partition.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
common/scsi.c

index d55ba892a6fef22109897a8621b4be2d8446a305..972ef338be639712caf642fa65786e377b23f88b 100644 (file)
@@ -540,7 +540,6 @@ static int scsi_detect_dev(int target, int lun, struct blk_desc *dev_desc)
        dev_desc->blksz = blksz;
        dev_desc->log2blksz = LOG2(dev_desc->blksz);
        dev_desc->type = perq;
-       part_init(&dev_desc[0]);
 removable:
        return 0;
 }
@@ -605,6 +604,7 @@ int scsi_scan(int mode)
                                        device_unbind(bdev);
                                        continue;
                                }
+                               part_init(bdesc);
 
                                if (mode == 1) {
                                        printf("  Device %d: ", 0);
@@ -634,6 +634,7 @@ int scsi_scan(int mode)
                                              &scsi_dev_desc[scsi_max_devs]);
                        if (ret)
                                continue;
+                       part_init(&scsi_dev_desc[scsi_max_devs]);
 
                        if (mode == 1) {
                                printf("  Device %d: ", 0);