Commit 120bda35 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik
Browse files

git-libata-all-ipr-fix



drivers/scsi/ipr.c: In function '__ipr_eh_dev_reset':
drivers/scsi/ipr.c:3865: warning: passing argument 4 of 'ata_do_eh' from incompatible pointer type

Cc: Tejun Heo <htejun@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 771b8dad
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -3770,7 +3770,8 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
 * Return value:
 *	0 on success / non-zero on failure
 **/
static int ipr_sata_reset(struct ata_port *ap, unsigned int *classes)
static int ipr_sata_reset(struct ata_port *ap, unsigned int *classes,
				unsigned long deadline)
{
	struct ipr_sata_port *sata_port = ap->private_data;
	struct ipr_ioa_cfg *ioa_cfg = sata_port->ioa_cfg;