Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c1e6aaf0ab0150d625dc266721c033db8b43e49d

Authored by Richard Cochran
Committed by David S. Miller
1 parent e35f30c131
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ixp4xx_eth: Fix up the get_ts_info ethtool method. 

Commit e77bd1ec121ee4163a6b42a44e87b2e382c39e04 added support for a
new ethtool function, but that cannot compile due to a misnamed global
variable. Not that it really matters (since the IXP4xx does compile
either, as of about Linux 3.1) but just in case, this patch fixes the
misnamed variable in the PHC driver.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/ptp/ptp_ixp46x.c
Diff comments   View file @ c1e6aaf
... ... @@ -284,7 +284,7 @@
284 284 {
285 285 free_irq(MASTER_IRQ, &ixp_clock);
286 286 free_irq(SLAVE_IRQ, &ixp_clock);
287   - ixp46x_phc_clock = -1;
  287 + ixp46x_phc_index = -1;
288 288 ptp_clock_unregister(ixp_clock.ptp_clock);
289 289 }
290 290  
... ... @@ -303,7 +303,7 @@
303 303 if (IS_ERR(ixp_clock.ptp_clock))
304 304 return PTR_ERR(ixp_clock.ptp_clock);
305 305  
306   - ixp46x_phc_clock = ptp_clock_index(ixp_clock.ptp_clock);
  306 + ixp46x_phc_index = ptp_clock_index(ixp_clock.ptp_clock);
307 307  
308 308 __raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend);
309 309 __raw_writel(1, &ixp_clock.regs->trgt_lo);