diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 18:01:31 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 18:01:31 +0200 |
| commit | 27eb2c4b3d3e13f376a359e293c212a2e9407af5 (patch) | |
| tree | 556aa7b5cd6eeb4214dec129c789515157187010 /drivers/isdn/divert/isdn_divert.c | |
| parent | Input: tps6507x-ts - convert to polled input device infrastructure (diff) | |
| parent | Input: cyttsp4 - SPI driver for Cypress TMA4XX touchscreen devices (diff) | |
| download | linux-27eb2c4b3d3e13f376a359e293c212a2e9407af5.tar.xz linux-27eb2c4b3d3e13f376a359e293c212a2e9407af5.zip | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.11 merge window.
Diffstat (limited to 'drivers/isdn/divert/isdn_divert.c')
| -rw-r--r-- | drivers/isdn/divert/isdn_divert.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c index db432e635496..50749a70c5ca 100644 --- a/drivers/isdn/divert/isdn_divert.c +++ b/drivers/isdn/divert/isdn_divert.c @@ -441,8 +441,7 @@ static int isdn_divert_icall(isdn_ctrl *ic) switch (dv->rule.action) { case DEFLECT_IGNORE: - return (0); - break; + return 0; case DEFLECT_ALERT: case DEFLECT_PROCEED: @@ -510,10 +509,9 @@ static int isdn_divert_icall(isdn_ctrl *ic) break; default: - return (0); /* ignore call */ - break; + return 0; /* ignore call */ } /* switch action */ - break; + break; /* will break the 'for' looping */ } /* scan_table */ if (cs) { |