Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c78b37 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata reset-seq] build and merge fixes 



Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 31daabda

drivers/ata/pata_artop.c

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ static int artop6260_pre_reset(struct ata_port *ap, unsigned long deadline) 
	/* Odd numbered device ids are the units with enable bits (the -R cards) */

	if (pdev->device % 1 && !pci_test_config_bits(pdev, &artop_enable_bits[ap->port_no]))

		return -ENOENT;

	return ata_std_prereset(ap);



	return ata_std_prereset(ap, deadline);

}



/**

drivers/ata/pata_marvell.c

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline) 
	if ((pdev->device == 0x6145) && (ap->port_no == 0) &&

	    (!(devices & 0x10)))	/* PATA enable ? */

		return -ENOENT;

	return ata_std_prereset(ap);



	return ata_std_prereset(ap, deadline);

}



static int marvell_cable_detect(struct ata_port *ap)

drivers/ata/pata_sis.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int sis_66_cable_detect(struct ata_port *ap) 
 *	Set up cable type and use generic probe init

 */



static int sis_old_pre_reset(struct ata_port *ap, unsigned long deadline)

static int sis_pre_reset(struct ata_port *ap, unsigned long deadline)

{

	static const struct pci_bits sis_enable_bits[] = {

		{ 0x4aU, 1U, 0x02UL, 0x02UL },	/* port 0 */