iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Browse Source 
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()
This commit is contained in:
Linus Torvalds 2016-06-28 12:11:31 -07:00
commit de4921ce9b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ata/ahci_seattle.c
View File

@ -137,7 +137,7 @@ static const struct ata_port_info *ahci_seattle_get_port_info(
u32 val; u32 val;
plat_data = devm_kzalloc(dev, sizeof(*plat_data), GFP_KERNEL); plat_data = devm_kzalloc(dev, sizeof(*plat_data), GFP_KERNEL);
if (IS_ERR(plat_data)) if (!plat_data)
return &ahci_port_info; return &ahci_port_info;
plat_data->sgpio_ctrl = devm_ioremap_resource(dev, plat_data->sgpio_ctrl = devm_ioremap_resource(dev,

2
drivers/ata/sata_mv.c
View File

@ -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 * Looks like a lot of fuss, but it avoids an unnecessary
* +1 usec read-after-write delay for unaffected registers. * +1 usec read-after-write delay for unaffected registers.
*/ */
laddr = (long)addr & 0xffff; laddr = (unsigned long)addr & 0xffff;
if (laddr >= 0x300 && laddr <= 0x33c) { if (laddr >= 0x300 && laddr <= 0x33c) {
laddr &= 0x000f; laddr &= 0x000f;
if (laddr == 0x4 || laddr == 0xc) { if (laddr == 0x4 || laddr == 0xc) {