Commit cd4baaaa authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller

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: default avatarRichard Cochran <richardcochran@gmail.com>
Reported-by: default avatarChris LaRocque <clarocq@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89cc80a4
...@@ -127,7 +127,6 @@ struct gianfar_ptp_registers { ...@@ -127,7 +127,6 @@ struct gianfar_ptp_registers {
#define DRIVER "gianfar_ptp" #define DRIVER "gianfar_ptp"
#define DEFAULT_CKSEL 1 #define DEFAULT_CKSEL 1
#define N_ALARM 1 /* first alarm is used internally to reset fipers */
#define N_EXT_TS 2 #define N_EXT_TS 2
#define REG_SIZE sizeof(struct gianfar_ptp_registers) #define REG_SIZE sizeof(struct gianfar_ptp_registers)
...@@ -410,7 +409,7 @@ static struct ptp_clock_info ptp_gianfar_caps = { ...@@ -410,7 +409,7 @@ static struct ptp_clock_info ptp_gianfar_caps = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "gianfar clock", .name = "gianfar clock",
.max_adj = 512000, .max_adj = 512000,
.n_alarm = N_ALARM, .n_alarm = 0,
.n_ext_ts = N_EXT_TS, .n_ext_ts = N_EXT_TS,
.n_per_out = 0, .n_per_out = 0,
.pps = 1, .pps = 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment