lkml.org 
[lkml]   [2014]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH RESEND v3] 3c59x: fix bad split of cpu_to_le32(pci_map_single())
From
From: Sylvain 'ythier' Hitier <sylvain.hitier@gmail.com>
Date: Tue, 7 Oct 2014 13:40:34 +0000

> From: Sylvain "ythier" Hitier <sylvain.hitier@gmail.com>
>
> In commit 6f2b6a3005b2c34c39f207a87667564f64f2f91a,
> # 3c59x: Add dma error checking and recovery
> the intent is to split out the mapping from the byte-swapping in order to
> insert a dma_mapping_error() check.
>
> Kinda this semantic patch:
>
> // See http://coccinelle.lip6.fr/
> //
> // Beware, grouik-and-dirty!
> @@
> expression DEV, X, Y, Z;
> @@
> - cpu_to_le32(pci_map_single(DEV, X, Y, Z))
> + dma_addr_t addr = pci_map_single(DEV, X, Y, Z);
> + if (dma_mapping_error(&DEV->dev, addr))
> + /* snip */;
> + cpu_to_le32(addr)
>
> However, the #else part (of the #if DO_ZEROCOPY test) is changed this way:
>
> - cpu_to_le32(pci_map_single(DEV, X, Y, Z))
> + dma_addr_t addr = cpu_to_le32(pci_map_single(DEV, X, Y, Z));
> // ^^^^^^^^^^^
> // That mismatches the 3 other changes!
> + if (dma_mapping_error(&DEV->dev, addr))
> + /* snip */;
> + cpu_to_le32(addr)
>
> Let's remove the leftover cpu_to_le32() for coherency.
>
> v2: Better changelog.
> v3: Add Acked-by
>
> Fixes: 6f2b6a3005b2c34c39f207a87667564f64f2f91a
> # 3c59x: Add dma error checking and recovery
> Acked-by: Neil Horman <nhorman@tuxdriver.com>
> Signed-off-by: Sylvain "ythier" Hitier <sylvain.hitier@gmail.com>

Applied and queued up for -stable, thanks!


\
 
 \ /
  Last update: 2014-10-07 20:01    [W:0.048 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site