diff options
Diffstat (limited to 'arch/arm/mach-sa1100/h3xxx.c')
-rw-r--r-- | arch/arm/mach-sa1100/h3xxx.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c index a7a1982d8411..b0784c974c2d 100644 --- a/arch/arm/mach-sa1100/h3xxx.c +++ b/arch/arm/mach-sa1100/h3xxx.c | |||
@@ -83,8 +83,10 @@ static void h3xxx_set_vpp(int vpp) | |||
83 | static int h3xxx_flash_init(void) | 83 | static int h3xxx_flash_init(void) |
84 | { | 84 | { |
85 | int err = gpio_request(H3XXX_EGPIO_VPP_ON, "Flash Vpp"); | 85 | int err = gpio_request(H3XXX_EGPIO_VPP_ON, "Flash Vpp"); |
86 | if (err) | 86 | if (err) { |
87 | pr_err("%s: can't request H3XXX_EGPIO_VPP_ON\n", __func__); | ||
87 | return err; | 88 | return err; |
89 | } | ||
88 | 90 | ||
89 | err = gpio_direction_output(H3XXX_EGPIO_VPP_ON, 0); | 91 | err = gpio_direction_output(H3XXX_EGPIO_VPP_ON, 0); |
90 | if (err) | 92 | if (err) |
@@ -143,11 +145,15 @@ static u_int h3xxx_uart_get_mctrl(struct uart_port *port) | |||
143 | 145 | ||
144 | static void h3xxx_uart_pm(struct uart_port *port, u_int state, u_int oldstate) | 146 | static void h3xxx_uart_pm(struct uart_port *port, u_int state, u_int oldstate) |
145 | { | 147 | { |
146 | if (port->mapbase == _Ser3UTCR0) | 148 | if (port->mapbase == _Ser3UTCR0) { |
147 | if (!gpio_request(H3XXX_EGPIO_RS232_ON, "RS232 transceiver")) { | 149 | if (!gpio_request(H3XXX_EGPIO_RS232_ON, "RS232 transceiver")) { |
148 | gpio_direction_output(H3XXX_EGPIO_RS232_ON, !state); | 150 | gpio_direction_output(H3XXX_EGPIO_RS232_ON, !state); |
149 | gpio_free(H3XXX_EGPIO_RS232_ON); | 151 | gpio_free(H3XXX_EGPIO_RS232_ON); |
152 | } else { | ||
153 | pr_err("%s: can't request H3XXX_EGPIO_RS232_ON\n", | ||
154 | __func__); | ||
150 | } | 155 | } |
156 | } | ||
151 | } | 157 | } |
152 | 158 | ||
153 | /* | 159 | /* |