diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2014-06-23 23:18:28 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-27 05:02:14 +0400 |
| commit | a143aa2ae0598e80bee2900c5d2800850558dc1f (patch) | |
| tree | 6c2722d78731b9919b6e2d91581aee12a7266d5e | |
| parent | 8955051192efcd2cb3903997387743a52de4472a (diff) | |
| download | linux-a143aa2ae0598e80bee2900c5d2800850558dc1f.tar.xz | |
Staging: bcm: led_control.c: Replaced doubled if-check by logical OR in one check
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/bcm/led_control.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c index 8a59115c24f4..ae49a5976c83 100644 --- a/drivers/staging/bcm/led_control.c +++ b/drivers/staging/bcm/led_control.c @@ -116,14 +116,11 @@ static INT blink_in_normal_bandwidth(struct bcm_mini_adapter *ad, if (*time > 0) { /* Blink both Tx and Rx LEDs */ - if (LED_Blink(ad, 1 << GPIO_Num_tx, uiTxLedIndex, *timeout, - *time, currdriverstate) == EVENT_SIGNALED) - return EVENT_SIGNALED; - - if (LED_Blink(ad, 1 << GPIO_Num_rx, uiRxLedIndex, *timeout, - *time, currdriverstate) == EVENT_SIGNALED) + if ((LED_Blink(ad, 1 << GPIO_Num_tx, uiTxLedIndex, *timeout, + *time, currdriverstate) == EVENT_SIGNALED) || + (LED_Blink(ad, 1 << GPIO_Num_rx, uiRxLedIndex, *timeout, + *time, currdriverstate) == EVENT_SIGNALED)) return EVENT_SIGNALED; - } if (*time == *time_tx) { |