]> git.baikalelectronics.ru Git - kernel.git/commit
sh_eth: Fix addition of .trscer_err_mask to wrong SoC data
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 15 Jan 2015 10:52:19 +0000 (11:52 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Jan 2015 19:09:37 +0000 (14:09 -0500)
commite21bb4959caddd3159d189f99e8c92310af8a0fb
treea07fbbdcf6669e96299760819e65f7ee1ad10687
parenta6ffb3161ceb0ebbcc32c1f5a5d4a289e8ff15d5
sh_eth: Fix addition of .trscer_err_mask to wrong SoC data

commit 25fe77d8924bf777 ("sh_eth: Fix access to TRSCER register") wanted
to add a .trscer_err_mask value to the R-Car Gen2 family-specific data
structure (r8a779x_data), but it was accidentally added to the
SH7724-specific data structure (sh7724_data).

Presumably this happened due to a patch conflict with commit
ec64ed2c8e8853cb ("sh-eth: Set fdr_value of R-Car SoCs"), which added
another field at the same position.

Move the field setting to fix this.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Fixes: 25fe77d8924bf777 ("sh_eth: Fix access to TRSCER register")
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/renesas/sh_eth.c