aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2013-04-22 15:42:16 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-25 01:46:00 -0400
commitcd4baaaa04b4aaa3b0ec4d13a6f3d203b92eadbd (patch)
tree33349cfe5bc7052fd494628dcf123d19c9e8ea54 /drivers/net
parent89cc80a44b7c320e08599cb86f6aef0ead8986a1 (diff)
gianfar: do not advertise any alarm capability.
An early draft of the PHC patch series included an alarm in the gianfar driver. During the review process, the alarm code was dropped, but the capability removal was overlooked. This patch fixes the issue by advertising zero alarms. This patch should be applied to every 3.x stable kernel. Signed-off-by: Richard Cochran <richardcochran@gmail.com> Reported-by: Chris LaRocque <clarocq@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/freescale/gianfar_ptp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index 2e5daee0438a..a3f8a2551f2d 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -127,7 +127,6 @@ struct gianfar_ptp_registers {
127 127
128#define DRIVER "gianfar_ptp" 128#define DRIVER "gianfar_ptp"
129#define DEFAULT_CKSEL 1 129#define DEFAULT_CKSEL 1
130#define N_ALARM 1 /* first alarm is used internally to reset fipers */
131#define N_EXT_TS 2 130#define N_EXT_TS 2
132#define REG_SIZE sizeof(struct gianfar_ptp_registers) 131#define REG_SIZE sizeof(struct gianfar_ptp_registers)
133 132
@@ -410,7 +409,7 @@ static struct ptp_clock_info ptp_gianfar_caps = {
410 .owner = THIS_MODULE, 409 .owner = THIS_MODULE,
411 .name = "gianfar clock", 410 .name = "gianfar clock",
412 .max_adj = 512000, 411 .max_adj = 512000,
413 .n_alarm = N_ALARM, 412 .n_alarm = 0,
414 .n_ext_ts = N_EXT_TS, 413 .n_ext_ts = N_EXT_TS,
415 .n_per_out = 0, 414 .n_per_out = 0,
416 .pps = 1, 415 .pps = 1,