Merge remote-tracking branch 'userns/for-next'

[karo-tx-linux.git] / drivers / tty / nozomi.c

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index d6080c3831ef98b72d8269dc3750f58f6d55bfba..cd04293695576aeec9cd25fdce8de91b97f7fd2c 100644 (file)
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -959,7 +959,7 @@ static int receive_flow_control(struct nozomi *dc)
                dev_err(&dc->pdev->dev,
                        "ERROR: flow control received for non-existing port\n");
                return 0;
-       };
+       }
 
        DBG1("0x%04X->0x%04X", *((u16 *)&dc->port[port].ctrl_dl),
           *((u16 *)&ctrl_dl));
@@ -1025,7 +1025,7 @@ static enum ctrl_port_type port2ctrl(enum port_type port,
                dev_err(&dc->pdev->dev,
                        "ERROR: send flow control " \
                        "received for non-existing port\n");
-       };
+       }
        return CTRL_ERROR;
 }
 
@@ -1805,7 +1805,7 @@ static int ntty_ioctl(struct tty_struct *tty,
        default:
                DBG1("ERR: 0x%08X, %d", cmd, cmd);
                break;
-       };
+       }
 
        return rval;
 }