diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 03:33:41 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-26 03:33:41 +0400 |
| commit | b2e448eca1a52fea181905845728ae00a138d84e (patch) | |
| tree | d1f9517a6dacf53f4401e8ab752737e1f5021acc /drivers/char/ipmi/ipmi_smic_sm.c | |
| parent | 2d2e7d195b902c419bc0b69ced026aca444d69a8 (diff) | |
| parent | d02b3709ff8efebfca0612d0ac2a6e31a91c13f4 (diff) | |
| download | linux-b2e448eca1a52fea181905845728ae00a138d84e.tar.xz | |
Merge branch 'ipmi' (ipmi patches from Corey Minyard)
Merge ipmi fixes from Corey Minyard:
"Just some collected fixes for 3.14. Nothing huge"
* emailed patches from Corey Minyard <minyard@acm.org>:
ipmi: Cleanup error return
ipmi: fix timeout calculation when bmc is disconnected
ipmi: use USEC_PER_SEC instead of 1000000 for more meaningful
ipmi: remove deprecated IRQF_DISABLED
Diffstat (limited to 'drivers/char/ipmi/ipmi_smic_sm.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_smic_sm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_smic_sm.c b/drivers/char/ipmi/ipmi_smic_sm.c index faed92971907..c8e77afa8b96 100644 --- a/drivers/char/ipmi/ipmi_smic_sm.c +++ b/drivers/char/ipmi/ipmi_smic_sm.c @@ -80,7 +80,7 @@ enum smic_states { #define SMIC_MAX_ERROR_RETRIES 3 /* Timeouts in microseconds. */ -#define SMIC_RETRY_TIMEOUT 2000000 +#define SMIC_RETRY_TIMEOUT (2*USEC_PER_SEC) /* SMIC Flags Register Bits */ #define SMIC_RX_DATA_READY 0x80 |