Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux.git] / drivers / pinctrl / pinctrl-lpc18xx.c

diff --git a/drivers/pinctrl/pinctrl-lpc18xx.c b/drivers/pinctrl/pinctrl-lpc18xx.c
index 190f17e4bbdafd287b9dd8d9cdeee4011f80c6c5..a14bc5e5fc248b19dd0e06a7e13c28e06dbffe8d 100644 (file)
--- a/drivers/pinctrl/pinctrl-lpc18xx.c
+++ b/drivers/pinctrl/pinctrl-lpc18xx.c
@@ -844,8 +844,11 @@ static int lpc18xx_pconf_get_pin(struct pinctrl_dev *pctldev, unsigned param,
                *arg = (reg & LPC18XX_SCU_PIN_EHD_MASK) >> LPC18XX_SCU_PIN_EHD_POS;
                switch (*arg) {
                case 3: *arg += 5;
+                       /* fall through */
                case 2: *arg += 5;
+                       /* fall through */
                case 1: *arg += 3;
+                       /* fall through */
                case 0: *arg += 4;
                }
                break;
@@ -1060,8 +1063,11 @@ static int lpc18xx_pconf_set_pin(struct pinctrl_dev *pctldev, unsigned param,
 
                switch (param_val) {
                case 20: param_val -= 5;
+                        /* fall through */
                case 14: param_val -= 5;
+                        /* fall through */
                case  8: param_val -= 3;
+                        /* fall through */
                case  4: param_val -= 4;
                         break;
                default: