Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupl...

[~andy/linux] / drivers / isdn / capi / capidrv.c

diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 6f5016b479f8a9188fd53a1624fe6cb5375db52e..832bc807ed20ec38a565578b209ec363190ad31f 100644 (file)
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -1593,7 +1593,7 @@ static int capidrv_command(isdn_ctrl *c, capidrv_contr *card)
                return capidrv_ioctl(c, card);
 
        switch (c->command) {
-       case ISDN_CMD_DIAL:{
+       case ISDN_CMD_DIAL: {
                u8 calling[ISDN_MSNLEN + 3];
                u8 called[ISDN_MSNLEN + 2];
 
@@ -2072,7 +2072,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
        card->interface.writebuf_skb = if_sendbuf;
        card->interface.writecmd = NULL;
        card->interface.readstat = if_readstat;
-       card->interface.features = ISDN_FEATURE_L2_HDLC |
+       card->interface.features =
+               ISDN_FEATURE_L2_HDLC |
                ISDN_FEATURE_L2_TRANS |
                ISDN_FEATURE_L3_TRANS |
                ISDN_FEATURE_P_UNKNOWN |
@@ -2080,7 +2081,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
                ISDN_FEATURE_L2_X75UI |
                ISDN_FEATURE_L2_X75BUI;
        if (profp->support1 & (1 << 2))
-               card->interface.features |= ISDN_FEATURE_L2_V11096 |
+               card->interface.features |=
+                       ISDN_FEATURE_L2_V11096 |
                        ISDN_FEATURE_L2_V11019 |
                        ISDN_FEATURE_L2_V11038;
        if (profp->support1 & (1 << 8))