From: Hannes Reinecke <hare@suse.de>
Date: Mon, 28 Aug 2017 08:14:26 +0000 (+0200)
Subject: scsi: qlogicpti: fixup qlogicpti_reset() definition
X-Git-Tag: v4.14-rc1~41^2~20
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fbf252335f8e2bd39d4ce59b1db0836a40ab227b;p=linux.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 <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

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;