diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-21 14:26:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-21 14:26:27 -0700 |
| commit | 5317821c08533e5f42f974e4e68e092beaf099b1 (patch) | |
| tree | 97a236f504dd138d68ae72b0e3368d116e612c78 /drivers/ata/pata_samsung_cf.c | |
| parent | cee5aa1f81b1e88d8de05df226bfd207041954c2 (diff) | |
| parent | 2a13772a144d2956a7fedd18685921d0a9b8b783 (diff) | |
| download | blackbird-op-linux-5317821c08533e5f42f974e4e68e092beaf099b1.tar.gz blackbird-op-linux-5317821c08533e5f42f974e4e68e092beaf099b1.zip | |
Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Nothing drastic but pushing out early due to build breakage in the new
tegra platform.
Additionally:
- M550 tagged trim blacklist pattern is widened so that it matches
the new 1TB model
- three controller specific fixes"
* 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
libata: widen Crucial M550 blacklist matching
pata_scc: propagate return value of scc_wait_after_reset
ata: ahci_tegra: Change include to fix compilation
pata_samsung_cf: change ret type to signed
ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI SATA Host Controller driver.
Diffstat (limited to 'drivers/ata/pata_samsung_cf.c')
| -rw-r--r-- | drivers/ata/pata_samsung_cf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c index 2578fc16960a..1a24a5dc3940 100644 --- a/drivers/ata/pata_samsung_cf.c +++ b/drivers/ata/pata_samsung_cf.c @@ -360,7 +360,7 @@ static int pata_s3c_wait_after_reset(struct ata_link *link, /* * pata_s3c_bus_softreset - PATA device software reset */ -static unsigned int pata_s3c_bus_softreset(struct ata_port *ap, +static int pata_s3c_bus_softreset(struct ata_port *ap, unsigned long deadline) { struct ata_ioports *ioaddr = &ap->ioaddr; |
