Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / drivers / isdn / mISDN / l1oip_core.c

diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index f8e405c383a0774948c464f415ac94f77d7a5679..2c0d2c2bf94648e273b7614a65e1bc09976663e8 100644 (file)
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -689,7 +689,7 @@ l1oip_socket_thread(void *data)
        hc->sin_remote.sin_addr.s_addr = htonl(hc->remoteip);
        hc->sin_remote.sin_port = htons((unsigned short)hc->remoteport);
 
-       /* bind to incomming port */
+       /* bind to incoming port */
        if (socket->ops->bind(socket, (struct sockaddr *)&hc->sin_local,
                              sizeof(hc->sin_local))) {
                printk(KERN_ERR "%s: Failed to bind socket to port %d.\n",