diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
| commit | 8bd142c01648cdb33e9bcafa0448ba2c20ed814c (patch) | |
| tree | 9197c60d3f9d4036f38f281a183e94750ceea1d7 /drivers/tty/serial/etraxfs-uart.c | |
| parent | d792abacaf1a1a8dfea353fab699b97fa6251c2a (diff) | |
| parent | fbb4574ce9a37e15a9872860bf202f2be5bdf6c4 (diff) | |
Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM Fixes for v4.4-rc3.
Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.
Diffstat (limited to 'drivers/tty/serial/etraxfs-uart.c')
| -rw-r--r-- | drivers/tty/serial/etraxfs-uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/etraxfs-uart.c b/drivers/tty/serial/etraxfs-uart.c index 6813e316e9ff..2f80bc7e44fb 100644 --- a/drivers/tty/serial/etraxfs-uart.c +++ b/drivers/tty/serial/etraxfs-uart.c | |||
| @@ -894,7 +894,7 @@ static int etraxfs_uart_probe(struct platform_device *pdev) | |||
| 894 | up->regi_ser = of_iomap(np, 0); | 894 | up->regi_ser = of_iomap(np, 0); |
| 895 | up->port.dev = &pdev->dev; | 895 | up->port.dev = &pdev->dev; |
| 896 | 896 | ||
| 897 | up->gpios = mctrl_gpio_init(&pdev->dev, 0); | 897 | up->gpios = mctrl_gpio_init_noauto(&pdev->dev, 0); |
| 898 | if (IS_ERR(up->gpios)) | 898 | if (IS_ERR(up->gpios)) |
| 899 | return PTR_ERR(up->gpios); | 899 | return PTR_ERR(up->gpios); |
| 900 | 900 | ||