Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"The one core change is a re-roll of the tag allocation fix from the
last pull request that uses the correct goto to unroll all the
allocations. The remianing fixes are all small ones in drivers"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: hisi_sas: Fix NULL pointer exception during user_scan()
scsi: qla2xxx: Completely fix fcport double free
scsi: ufs: core: Fix SError in ufshcd_rtc_work() during UFS suspend
scsi: core: Fix error handling for scsi_alloc_sdev()
+5
-11
+1
-1
drivers/scsi/hisi_sas/hisi_sas_main.c
+1
-1
drivers/scsi/hisi_sas/hisi_sas_main.c
···
2578
2578
shost->transportt = hisi_sas_stt;
2579
2579
shost->max_id = HISI_SAS_MAX_DEVICES;
2580
2580
shost->max_lun = ~0;
2581
-
shost->max_channel = 1;
2581
+
shost->max_channel = 0;
2582
2582
shost->max_cmd_len = HISI_SAS_MAX_CDB_LEN;
2583
2583
if (hisi_hba->hw->slot_index_alloc) {
2584
2584
shost->can_queue = HISI_SAS_MAX_COMMANDS;
+1
-1
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+1
-1
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
···
4993
4993
shost->transportt = hisi_sas_stt;
4994
4994
shost->max_id = HISI_SAS_MAX_DEVICES;
4995
4995
shost->max_lun = ~0;
4996
-
shost->max_channel = 1;
4996
+
shost->max_channel = 0;
4997
4997
shost->max_cmd_len = HISI_SAS_MAX_CDB_LEN;
4998
4998
shost->can_queue = HISI_SAS_UNRESERVED_IPTT;
4999
4999
shost->cmd_per_lun = HISI_SAS_UNRESERVED_IPTT;
-2
drivers/scsi/qla2xxx/qla_iocb.c
-2
drivers/scsi/qla2xxx/qla_iocb.c
···
2751
2751
if (!elsio->u.els_logo.els_logo_pyld) {
2752
2752
/* ref: INIT */
2753
2753
kref_put(&sp->cmd_kref, qla2x00_sp_release);
2754
-
qla2x00_free_fcport(fcport);
2755
2754
return QLA_FUNCTION_FAILED;
2756
2755
}
2757
2756
···
2775
2776
if (rval != QLA_SUCCESS) {
2776
2777
/* ref: INIT */
2777
2778
kref_put(&sp->cmd_kref, qla2x00_sp_release);
2778
-
qla2x00_free_fcport(fcport);
2779
2779
return QLA_FUNCTION_FAILED;
2780
2780
}
2781
2781
+2
-6
drivers/scsi/scsi_scan.c
+2
-6
drivers/scsi/scsi_scan.c
···
360
360
* default device queue depth to figure out sbitmap shift
361
361
* since we use this queue depth most of times.
362
362
*/
363
-
if (scsi_realloc_sdev_budget_map(sdev, depth)) {
364
-
kref_put(&sdev->host->tagset_refcnt, scsi_mq_free_tags);
365
-
put_device(&starget->dev);
366
-
kfree(sdev);
367
-
goto out;
368
-
}
363
+
if (scsi_realloc_sdev_budget_map(sdev, depth))
364
+
goto out_device_destroy;
369
365
370
366
scsi_change_queue_depth(sdev, depth);
371
367
+1
-1
drivers/ufs/core/ufshcd.c
+1
-1
drivers/ufs/core/ufshcd.c
···
10066
10066
}
10067
10067
10068
10068
flush_work(&hba->eeh_work);
10069
+
cancel_delayed_work_sync(&hba->ufs_rtc_update_work);
10069
10070
10070
10071
ret = ufshcd_vops_suspend(hba, pm_op, PRE_CHANGE);
10071
10072
if (ret)
···
10121
10120
if (ret)
10122
10121
goto set_link_active;
10123
10122
10124
-
cancel_delayed_work_sync(&hba->ufs_rtc_update_work);
10125
10123
goto out;
10126
10124
10127
10125
set_link_active: