diff options
Diffstat (limited to 'drivers/sh')
| -rw-r--r-- | drivers/sh/intc/core.c | 2 | ||||
| -rw-r--r-- | drivers/sh/pfc/pinctrl.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c index 32c26d795ed0..8f32a1323a79 100644 --- a/drivers/sh/intc/core.c +++ b/drivers/sh/intc/core.c | |||
| @@ -355,7 +355,7 @@ int __init register_intc_controller(struct intc_desc *desc) | |||
| 355 | if (unlikely(res)) { | 355 | if (unlikely(res)) { |
| 356 | if (res == -EEXIST) { | 356 | if (res == -EEXIST) { |
| 357 | res = irq_domain_associate(d->domain, | 357 | res = irq_domain_associate(d->domain, |
| 358 | irq, irq); | 358 | irq2, irq2); |
| 359 | if (unlikely(res)) { | 359 | if (unlikely(res)) { |
| 360 | pr_err("domain association " | 360 | pr_err("domain association " |
| 361 | "failure\n"); | 361 | "failure\n"); |
diff --git a/drivers/sh/pfc/pinctrl.c b/drivers/sh/pfc/pinctrl.c index 2804eaae804e..a3ac39b79192 100644 --- a/drivers/sh/pfc/pinctrl.c +++ b/drivers/sh/pfc/pinctrl.c | |||
| @@ -211,7 +211,8 @@ static int sh_pfc_gpio_request_enable(struct pinctrl_dev *pctldev, | |||
| 211 | break; | 211 | break; |
| 212 | default: | 212 | default: |
| 213 | pr_err("Unsupported mux type (%d), bailing...\n", pinmux_type); | 213 | pr_err("Unsupported mux type (%d), bailing...\n", pinmux_type); |
| 214 | return -ENOTSUPP; | 214 | ret = -ENOTSUPP; |
| 215 | goto err; | ||
| 215 | } | 216 | } |
| 216 | 217 | ||
| 217 | ret = 0; | 218 | ret = 0; |