tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
"Three driver fixes (and one version number update): a suspend hang in
ufs, a qla hard lock on module removal and a qedi panic during
discovery"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: qla2xxx: Fix hardlockup in abort command during driver remove
scsi: ufs: Avoid runtime suspend possibly being blocked forever
scsi: qedi: update driver version to 8.37.0.20
scsi: qedi: Check targetname while finding boot target information

Linus Torvalds f4102766 a8282bf0

+11 -11
+3
drivers/scsi/qedi/qedi_main.c
··· 987 987 if (!iscsi_is_session_online(cls_sess)) 988 988 continue; 989 989 990 + if (!sess->targetname) 991 + continue; 992 + 990 993 if (pri_ctrl_flags) { 991 994 if (!strcmp(pri_tgt->iscsi_name, sess->targetname) && 992 995 !strcmp(pri_tgt->ip_addr, ep_ip_addr)) {
+3 -3
drivers/scsi/qedi/qedi_version.h
··· 4 4 * Copyright (c) 2016 Cavium Inc. 5 5 */ 6 6 7 - #define QEDI_MODULE_VERSION "8.33.0.21" 7 + #define QEDI_MODULE_VERSION "8.37.0.20" 8 8 #define QEDI_DRIVER_MAJOR_VER 8 9 - #define QEDI_DRIVER_MINOR_VER 33 9 + #define QEDI_DRIVER_MINOR_VER 37 10 10 #define QEDI_DRIVER_REV_VER 0 11 - #define QEDI_DRIVER_ENG_VER 21 11 + #define QEDI_DRIVER_ENG_VER 20
+1 -1
drivers/scsi/qla2xxx/qla_os.c
··· 1731 1731 !test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) && 1732 1732 !qla2x00_isp_reg_stat(ha))) { 1733 1733 sp->comp = ∁ 1734 - rval = ha->isp_ops->abort_command(sp); 1735 1734 spin_unlock_irqrestore(qp->qp_lock_ptr, *flags); 1735 + rval = ha->isp_ops->abort_command(sp); 1736 1736 1737 1737 switch (rval) { 1738 1738 case QLA_SUCCESS:
+4 -7
drivers/scsi/ufs/ufshcd-pltfrm.c
··· 430 430 goto dealloc_host; 431 431 } 432 432 433 - pm_runtime_set_active(&pdev->dev); 434 - pm_runtime_enable(&pdev->dev); 435 - 436 433 ufshcd_init_lanes_per_dir(hba); 437 434 438 435 err = ufshcd_init(hba, mmio_base, irq); 439 436 if (err) { 440 437 dev_err(dev, "Initialization failed\n"); 441 - goto out_disable_rpm; 438 + goto dealloc_host; 442 439 } 443 440 444 441 platform_set_drvdata(pdev, hba); 445 442 443 + pm_runtime_set_active(&pdev->dev); 444 + pm_runtime_enable(&pdev->dev); 445 + 446 446 return 0; 447 447 448 - out_disable_rpm: 449 - pm_runtime_disable(&pdev->dev); 450 - pm_runtime_set_suspended(&pdev->dev); 451 448 dealloc_host: 452 449 ufshcd_dealloc_host(hba); 453 450 out: