From: Hannes Reinecke Date: Mon, 28 Aug 2017 08:14:26 +0000 (+0200) Subject: scsi: qlogicpti: fixup qlogicpti_reset() definition X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fbf252335f8e2bd39d4ce59b1db0836a40ab227b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git scsi: qlogicpti: fixup qlogicpti_reset() definition A merge error crept in when formatting commit af167bc ("scsi: qlogicpti: move bus reset to host reset") Fixes: af167bc ("scsi: qlogicpti: move bus reset to host reset") Signed-off-by: Hannes Reinecke Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 274ee1ccfea8..cec9a14982e6 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -1250,9 +1250,10 @@ static int qlogicpti_abort(struct scsi_cmnd *Cmnd) return return_status; } -static int qlogicpti_reset(struct Scsi_Host *host) +static int qlogicpti_reset(struct scsi_cmnd *Cmnd) { u_short param[6]; + struct Scsi_Host *host = Cmnd->device->host; struct qlogicpti *qpti = (struct qlogicpti *) host->hostdata; int return_status = SUCCESS;