diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 15:16:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 15:16:00 -0800 |
| commit | d5379e5eddc09f8d172d9d6aa0e5a269a89dc60a (patch) | |
| tree | 8b5ea0d52c32d48bb4acda193e5f5d0c378f402e /arch/microblaze/kernel/timer.c | |
| parent | ec92b88c3c05dd9bc75379014858c504ebb9ecbc (diff) | |
| parent | 3400606d8ffd64ea7ffb5969f7c96daebeff36f3 (diff) | |
| download | linux-d5379e5eddc09f8d172d9d6aa0e5a269a89dc60a.tar.bz2 | |
Merge tag 'microblaze-4.10-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull arch/microblaze updates from Michal Simek:
- wire-up new syscalls
- add new codes and fpga families
- fix a return value
* tag 'microblaze-4.10-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Add new fpga families
microblaze: Add missing release version code v9.6 and v10
microblaze: Add missing syscalls
microblaze: Fix return value from xilinx_timer_init
Diffstat (limited to 'arch/microblaze/kernel/timer.c')
| -rw-r--r-- | arch/microblaze/kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index 5bbf38b916ef..9e954959f605 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -259,7 +259,7 @@ static int __init xilinx_timer_init(struct device_node *timer) int ret; if (initialized) - return; + return -EINVAL; initialized = 1; |