git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
char
/
ipmi
/
ipmi_kcs_sm.c
diff --git
a/drivers/char/ipmi/ipmi_kcs_sm.c
b/drivers/char/ipmi/ipmi_kcs_sm.c
index
2062675
..
da15541
100644
(file)
--- a/
drivers/char/ipmi/ipmi_kcs_sm.c
+++ b/
drivers/char/ipmi/ipmi_kcs_sm.c
@@
-227,7
+227,7
@@
static inline int check_ibf(struct si_sm_data *kcs, unsigned char status,
static inline int check_obf(struct si_sm_data *kcs, unsigned char status,
long time)
{
static inline int check_obf(struct si_sm_data *kcs, unsigned char status,
long time)
{
- if (!GET_STATUS_OBF(status)) {
+ if (!
GET_STATUS_OBF(status)) {
kcs->obf_timeout -= time;
if (kcs->obf_timeout < 0) {
start_error_recovery(kcs, "OBF not ready in time");
kcs->obf_timeout -= time;
if (kcs->obf_timeout < 0) {
start_error_recovery(kcs, "OBF not ready in time");
@@
-407,7
+407,7
@@
static enum si_sm_result kcs_event(struct si_sm_data *kcs, long time)
}
if (state == KCS_READ_STATE) {
}
if (state == KCS_READ_STATE) {
- if (!check_obf(kcs, status, time))
+ if (!
check_obf(kcs, status, time))
return SI_SM_CALL_WITH_DELAY;
read_next_byte(kcs);
} else {
return SI_SM_CALL_WITH_DELAY;
read_next_byte(kcs);
} else {
@@
-447,7
+447,7
@@
static enum si_sm_result kcs_event(struct si_sm_data *kcs, long time)
"Not in read state for error2");
break;
}
"Not in read state for error2");
break;
}
- if (!check_obf(kcs, status, time))
+ if (!
check_obf(kcs, status, time))
return SI_SM_CALL_WITH_DELAY;
clear_obf(kcs, status);
return SI_SM_CALL_WITH_DELAY;
clear_obf(kcs, status);
@@
-462,7
+462,7
@@
static enum si_sm_result kcs_event(struct si_sm_data *kcs, long time)
break;
}
break;
}
- if (!check_obf(kcs, status, time))
+ if (!
check_obf(kcs, status, time))
return SI_SM_CALL_WITH_DELAY;
clear_obf(kcs, status);
return SI_SM_CALL_WITH_DELAY;
clear_obf(kcs, status);