diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2017-06-17 06:36:00 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-07-28 12:02:47 -0600 |
| commit | db13a768a07b31b4955db934f3d55d2c77335bcc (patch) | |
| tree | 32cd979ba4351e0a2b02f5735512d4fd2a484183 /cmd/scsi.c | |
| parent | 9c1390d4b988b1c7170dca9d06539ea1a363dfe7 (diff) | |
| download | u-boot-db13a768a07b31b4955db934f3d55d2c77335bcc.zip u-boot-db13a768a07b31b4955db934f3d55d2c77335bcc.tar.gz u-boot-db13a768a07b31b4955db934f3d55d2c77335bcc.tar.bz2 | |
cmd: scsi: Fix null pointer dereference in 'scsi reset'
During 'scsi reset', scsi_bus_reset() is called with udevice pointed
to NULL, which causes exception. As a temporary fix, disable the call
for DM SCSI for now.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'cmd/scsi.c')
| -rw-r--r-- | cmd/scsi.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -36,7 +36,9 @@ static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) case 2: if (strncmp(argv[1], "res", 3) == 0) { printf("\nReset SCSI\n"); +#ifndef CONFIG_DM_SCSI scsi_bus_reset(NULL); +#endif ret = scsi_scan(true); if (ret) return CMD_RET_FAILURE; |