diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-28 22:11:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-28 22:11:31 +0300 |
| commit | de4921ce9b3bc68aa530249df8d85cde8edc0968 (patch) | |
| tree | faf4e3ac30a5b3af103a329facffdd5dff3b7c9e /drivers/ata | |
| parent | 595d9e34eedc4b8d0631260ce93bbeb08e5b3bd7 (diff) | |
| parent | 76bf3441ad6584ddc3aea1501927f21b21ba3a3a (diff) | |
| download | linux-de4921ce9b3bc68aa530249df8d85cde8edc0968.tar.xz | |
Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Two trivial fixes - one for a bug in the allocation failure path and
the other a compiler warning fix"
* 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ata: sata_mv: fix mis-conversion in mv_write_cached_reg()
ata: fix return value check in ahci_seattle_get_port_info()
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/ahci_seattle.c | 2 | ||||
| -rw-r--r-- | drivers/ata/sata_mv.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/ahci_seattle.c b/drivers/ata/ahci_seattle.c index 6e702ab57220..1d31c0c0fc20 100644 --- a/drivers/ata/ahci_seattle.c +++ b/drivers/ata/ahci_seattle.c @@ -137,7 +137,7 @@ static const struct ata_port_info *ahci_seattle_get_port_info( u32 val; plat_data = devm_kzalloc(dev, sizeof(*plat_data), GFP_KERNEL); - if (IS_ERR(plat_data)) + if (!plat_data) return &ahci_port_info; plat_data->sgpio_ctrl = devm_ioremap_resource(dev, diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index bd74ee555278..745489a1c86a 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -986,7 +986,7 @@ static inline void mv_write_cached_reg(void __iomem *addr, u32 *old, u32 new) * Looks like a lot of fuss, but it avoids an unnecessary * +1 usec read-after-write delay for unaffected registers. */ - laddr = (long)addr & 0xffff; + laddr = (unsigned long)addr & 0xffff; if (laddr >= 0x300 && laddr <= 0x33c) { laddr &= 0x000f; if (laddr == 0x4 || laddr == 0xc) { |