diff options
| author |   Richard Cochran <richardcochran@gmail.com> | 2013-04-22 19:42:16 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-04-25 01:46:00 -0400 |
| commit | cd4baaaa04b4aaa3b0ec4d13a6f3d203b92eadbd (patch) | |
| tree | 33349cfe5bc7052fd494628dcf123d19c9e8ea54 /drivers/net/ethernet/freescale | |
| parent | sfc: Fix naming of MTD partitions for FPGA bitfiles (diff) | |
| download | linux-dev-cd4baaaa04b4aaa3b0ec4d13a6f3d203b92eadbd.tar.xz linux-dev-cd4baaaa04b4aaa3b0ec4d13a6f3d203b92eadbd.zip | |
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/ethernet/freescale')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar_ptp.c | 3 |
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 { #define DRIVER "gianfar_ptp" #define DEFAULT_CKSEL 1 -#define N_ALARM 1 /* first alarm is used internally to reset fipers */ #define N_EXT_TS 2 #define REG_SIZE sizeof(struct gianfar_ptp_registers) @@ -410,7 +409,7 @@ static struct ptp_clock_info ptp_gianfar_caps = { .owner = THIS_MODULE, .name = "gianfar clock", .max_adj = 512000, - .n_alarm = N_ALARM, + .n_alarm = 0, .n_ext_ts = N_EXT_TS, .n_per_out = 0, .pps = 1, |