diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-03-13 13:58:08 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-03-13 13:58:08 +0000 |
| commit | 0eda0dac2fdffeed812ddcfc882b613e0206eff3 (patch) | |
| tree | 3fedf03f6aeb94d52954f0310bca3d49362c49f2 /super-intel.c | |
| parent | Releasing debian version 4.2+20230302-1. (diff) | |
| download | mdadm-0eda0dac2fdffeed812ddcfc882b613e0206eff3.tar.xz mdadm-0eda0dac2fdffeed812ddcfc882b613e0206eff3.zip | |
Merging upstream version 4.2+20230304.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | super-intel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/super-intel.c b/super-intel.c index 89fac62..e155a8a 100644 --- a/super-intel.c +++ b/super-intel.c @@ -713,12 +713,12 @@ static struct sys_dev* find_disk_attached_hba(int fd, const char *devname) for (elem = list; elem; elem = elem->next) if (path_attached_to_hba(disk_path, elem->path)) - return elem; + break; if (disk_path != devname) free(disk_path); - return NULL; + return elem; } static int find_intel_hba_capability(int fd, struct intel_super *super, @@ -4515,6 +4515,7 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname) MIGR_REC_BUF_SECTORS*MAX_SECTOR_SIZE) != 0) { pr_err("could not allocate migr_rec buffer\n"); free(super->buf); + super->buf = NULL; return 2; } super->clean_migration_record_by_mdmon = 0; |