mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
SCSI misc on 20181102
This is a set of minor small (and safe changes) that didn't make the initial pull request plus some bug fixes. Signed-off-by: James E.J. Bottomley <[email protected]> -----BEGIN PGP SIGNATURE----- iJwEABMIAEQWIQTnYEDbdso9F2cI+arnQslM7pishQUCW9zD2CYcamFtZXMuYm90 dG9tbGV5QGhhbnNlbnBhcnRuZXJzaGlwLmNvbQAKCRDnQslM7pishaMPAQDwYDbt wsCd4SlAPz1PzAV25GL3zeBpk5UeCjv2/nIzEgEA6P+poJC85aVznrjNQ2kUyWdS h/NrvG9UJmvVngKpDWQ= =FHI8 -----END PGP SIGNATURE----- Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull more SCSI updates from James Bottomley: "This is a set of minor small (and safe changes) that didn't make the initial pull request plus some bug fixes" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: mvsas: Remove set but not used variable 'id' scsi: qla2xxx: Remove two arguments from qlafx00_error_entry() scsi: qla2xxx: Make sure that qlafx00_ioctl_iosb_entry() initializes 'res' scsi: qla2xxx: Remove a set-but-not-used variable scsi: qla2xxx: Make qla2x00_sysfs_write_nvram() easier to analyze scsi: qla2xxx: Declare local functions 'static' scsi: qla2xxx: Improve several kernel-doc headers scsi: qla2xxx: Modify fall-through annotations scsi: 3w-sas: 3w-9xxx: Use unsigned char for cdb scsi: mvsas: Use dma_pool_zalloc scsi: target: Don't request modules that aren't even built scsi: target: Set response length for REPORT TARGET PORT GROUPS
This commit is contained in:
commit
af102b333a
16 changed files with 52 additions and 50 deletions
|
|
@ -268,7 +268,7 @@ target_emulate_report_target_port_groups(struct se_cmd *cmd)
|
|||
}
|
||||
transport_kunmap_data_sg(cmd);
|
||||
|
||||
target_complete_cmd(cmd, GOOD);
|
||||
target_complete_cmd_with_length(cmd, GOOD, rd_len + 4);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -205,19 +205,19 @@ void transport_subsystem_check_init(void)
|
|||
if (sub_api_initialized)
|
||||
return;
|
||||
|
||||
ret = request_module("target_core_iblock");
|
||||
ret = IS_ENABLED(CONFIG_TCM_IBLOCK) && request_module("target_core_iblock");
|
||||
if (ret != 0)
|
||||
pr_err("Unable to load target_core_iblock\n");
|
||||
|
||||
ret = request_module("target_core_file");
|
||||
ret = IS_ENABLED(CONFIG_TCM_FILEIO) && request_module("target_core_file");
|
||||
if (ret != 0)
|
||||
pr_err("Unable to load target_core_file\n");
|
||||
|
||||
ret = request_module("target_core_pscsi");
|
||||
ret = IS_ENABLED(CONFIG_TCM_PSCSI) && request_module("target_core_pscsi");
|
||||
if (ret != 0)
|
||||
pr_err("Unable to load target_core_pscsi\n");
|
||||
|
||||
ret = request_module("target_core_user");
|
||||
ret = IS_ENABLED(CONFIG_TCM_USER2) && request_module("target_core_user");
|
||||
if (ret != 0)
|
||||
pr_err("Unable to load target_core_user\n");
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue