diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-20 19:56:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-20 19:56:23 -0800 |
| commit | 7be5cb14611945044306ecb7444678c43df21135 (patch) | |
| tree | aa381f5a5ecdb7f0f144bb2afa919b44782de0b8 /include | |
| parent | 1803f3389b7ac9ed33ea561b3b94e22e2864a95d (diff) | |
| parent | 73fd8b6d310196ae878767200786503fcff57bd5 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: fix kernel-doc parameter warning
sata_mv: remove iounmap in mv_platform_remove and use devm_iomap
ata: fix sparse warning in libata.h
libata: implement libata.force module parameter
sata_mv: use hpriv->base instead of the host->iomap
sata_mv: Define module alias for platform device
ata: fix sparse warnings in pata_legacy.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 2e098f940ce..ce7603a7315 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -1197,7 +1197,7 @@ static inline struct ata_link *ata_port_next_link(struct ata_link *link) return ap->pmp_link; } - if (++link - ap->pmp_link < ap->nr_pmp_links) + if (++link < ap->nr_pmp_links + ap->pmp_link) return link; return NULL; } |