diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-09-24 20:13:45 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2015-12-07 10:14:29 +0100 |
| commit | b8de29feaee2a26e4a72800ed17994c9312f1735 (patch) | |
| tree | c7ccaa37c34aa9c3b9b752da4f6d89b383c7f1a0 | |
| parent | 596e5782e7bdec7ed275b1204122364a3ab4fbf7 (diff) | |
| download | talos-obmc-uboot-b8de29feaee2a26e4a72800ed17994c9312f1735.tar.gz talos-obmc-uboot-b8de29feaee2a26e4a72800ed17994c9312f1735.zip | |
net: gem: Enable CTRL+C in wait_for_bit
Enable to break waiting loop at any time.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | drivers/net/zynq_gem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 0ee909c97f..0a41281e90 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -14,6 +14,7 @@ #include <net.h> #include <netdev.h> #include <config.h> +#include <console.h> #include <malloc.h> #include <asm/io.h> #include <phy.h> @@ -469,6 +470,11 @@ static int wait_for_bit(const char *func, u32 *reg, const u32 mask, if (get_timer(start) > timeout) break; + if (ctrlc()) { + puts("Abort\n"); + return -EINTR; + } + udelay(1); } |
