Commit 00b827f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "Two minor updates, both in drivers"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: core: Remove redundant query_complete trace
  scsi: myrb: Fix spelling mistake "statux" -> "status"
parents e205ff48 0e9693b9

drivers/scsi/myrb.c

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static bool myrb_enable_mmio(struct myrb_hba *cb, mbox_mmio_init_t mmio_init_fn) 
		status = mmio_init_fn(pdev, base, &mbox);

		if (status != MYRB_STATUS_SUCCESS) {

			dev_err(&pdev->dev,

				"Failed to enable mailbox, statux %02X\n",

				"Failed to enable mailbox, status %02X\n",

				status);

			return false;

		}

drivers/ufs/core/ufshcd.c

+0 −2
Original line number Diff line number Diff line
@@ -7265,8 +7265,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba, 
			err = -EINVAL;

		}

	}

	ufshcd_add_query_upiu_trace(hba, err ? UFS_QUERY_ERR : UFS_QUERY_COMP,

				    (struct utp_upiu_req *)lrbp->ucd_rsp_ptr);



	return err;

}