diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2025-11-19 22:59:25 -0500 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2025-11-19 22:59:25 -0500 |
| commit | e54f7b4b8159d76d601788ca61267247fac67abf (patch) | |
| tree | 27fd53e094b320bccf3cc38f80650126e0757544 /drivers/scsi/hosts.c | |
| parent | 13b77ed9c2a9e5a1248222df8aeaecb0c2ead9cb (diff) | |
| parent | a2b32bc1d9e359a9f90d0de6af16699facb10935 (diff) | |
Merge branch 6.18/scsi-fixes into 6.19/scsi-staging
Pull in fixes branch to resolve UFS merge conflict.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index e047747d4ecf..1b3fbd328277 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -626,8 +626,9 @@ int scsi_host_busy(struct Scsi_Host *shost) { int cnt = 0; - blk_mq_tagset_busy_iter(&shost->tag_set, - scsi_host_check_in_flight, &cnt); + if (shost->tag_set.ops) + blk_mq_tagset_busy_iter(&shost->tag_set, + scsi_host_check_in_flight, &cnt); return cnt; } EXPORT_SYMBOL(scsi_host_busy); |