diff --git a/zipl/include/job.h b/zipl/include/job.h
index f7a35ed3..d0daeb5a 100644
--- a/zipl/include/job.h
+++ b/zipl/include/job.h
@@ -136,6 +136,6 @@ void job_free(struct job_data* job);
 int type_from_target(char *target, disk_type_t *type);
 int check_job_dump_images(struct job_dump_data* dump, char* name);
 int check_job_images_ngdump(struct job_dump_data* dump, char* name);
-bool is_ngdump_enabled(const char* device, struct job_target_data* target);
+bool is_ngdump_enabled(struct job_data *job);
 
 #endif /* not JOB_H */
diff --git a/zipl/src/bootmap.c b/zipl/src/bootmap.c
index b6f60d53..9e13639a 100644
--- a/zipl/src/bootmap.c
+++ b/zipl/src/bootmap.c
@@ -1800,7 +1800,7 @@ int prepare_bootloader(struct job_data *job, struct install_set *bis)
 	if (init_bis(job, bis))
 		return -1;
 	if (job->id == job_dump_partition) {
-		if (is_ngdump_enabled(job->data.dump.device, &job->target))
+		if (is_ngdump_enabled(job))
 			return prepare_bootloader_ngdump(job, bis);
 		else
 			return prepare_bootloader_device(job, bis);
diff --git a/zipl/src/install.c b/zipl/src/install.c
index 5324d6e5..5241380f 100644
--- a/zipl/src/install.c
+++ b/zipl/src/install.c
@@ -460,7 +460,7 @@ int install_bootloader(struct job_data *job, struct install_set *bis)
 	if (job->id == job_dump_partition) {
 		rc = install_bootloader_dump(bis->tables, info,
 					     scsi_dump_sb_blockptr,
-					     is_ngdump_enabled(job->data.dump.device, &job->target),
+					     is_ngdump_enabled(job),
 					     fd);
 	} else {
 		rc = install_bootloader_ipl(bis->tables, info, fd);
diff --git a/zipl/src/job.c b/zipl/src/job.c
index ebab597c..c97644cc 100644
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -2020,7 +2020,7 @@ job_get(int argc, char* argv[], struct job_data** data)
 }
 
 bool
-is_ngdump_enabled(const char* device, struct job_target_data* target)
+is_ngdump_enabled(struct job_data *job)
 {
-	return disk_is_nvme(device, target);
+	return disk_is_nvme(job->data.dump.device, &job->target);
 }
diff --git a/zipl/src/zipl.c b/zipl/src/zipl.c
index 64a42de9..3404851d 100644
--- a/zipl/src/zipl.c
+++ b/zipl/src/zipl.c
@@ -184,7 +184,7 @@ main(int argc, char* argv[])
 			rc = -1;
 			break;
 		}
-		if (is_ngdump_enabled(job->data.dump.device, &job->target))
+		if (is_ngdump_enabled(job))
 			rc = check_job_images_ngdump(&job->data.dump, job->name);
 		else
 			rc = check_job_dump_images(&job->data.dump, job->name);