Merge remote-tracking branch 'regulator/topic/palmas' into v3.9-rc8

[firefly-linux-kernel-4.4.55.git] / drivers / sbus / char / openprom.c

diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 2236aea3ca2fde226e1e85fcffd3461f2321d06c..5843288f64bc00c8e5666a499767aee995795820 100644 (file)
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -222,7 +222,7 @@ static int opromnext(void __user *argp, unsigned int cmd, struct device_node *dp
                case OPROMSETCUR:
                default:
                        break;
-               };
+               }
        } else {
                /* Sibling of node zero is the root node.  */
                if (cmd != OPROMNEXT)
@@ -588,7 +588,7 @@ static int openprom_bsd_ioctl(struct file * file,
        default:
                err = -EINVAL;
                break;
-       };
+       }
        mutex_unlock(&openprom_mutex);
 
        return err;