From a424abd2c3074efb774ded788d773e8faaa530e5 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 9 May 2012 03:06:46 +0900 Subject: [PATCH] --- yaml --- r: 304576 b: refs/heads/master c: feb5680e063fd39873e9e638937f1197d38a81ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rts5139/rts51x_chip.h | 10 +++++----- trunk/drivers/staging/rts5139/sd.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f76199adb5a7..21b9019af563 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25c59c553828145860d983bdd8ee445c1209dd0a +refs/heads/master: feb5680e063fd39873e9e638937f1197d38a81ca diff --git a/trunk/drivers/staging/rts5139/rts51x_chip.h b/trunk/drivers/staging/rts5139/rts51x_chip.h index cab8ab098138..65c3ee943826 100644 --- a/trunk/drivers/staging/rts5139/rts51x_chip.h +++ b/trunk/drivers/staging/rts5139/rts51x_chip.h @@ -232,8 +232,8 @@ struct trace_msg_t { #define CUR_ERR 0x70 /* current error */ #define DEF_ERR 0x71 /* specific command error */ -/*---- sense key Infomation ----*/ -#define SNSKEYINFO_LEN 3 /* length of sense key infomation */ +/*---- sense key Information ----*/ +#define SNSKEYINFO_LEN 3 /* length of sense key information */ #define SKSV 0x80 #define CDB_ILLEGAL 0x40 @@ -286,13 +286,13 @@ struct sense_data_t { unsigned char seg_no; /* segment No. */ unsigned char sense_key; /* byte5 : ILI */ /* bit3-0 : sense key */ - unsigned char info[4]; /* infomation */ + unsigned char info[4]; /* information */ unsigned char ad_sense_len; /* additional sense data length */ - unsigned char cmd_info[4]; /* command specific infomation */ + unsigned char cmd_info[4]; /* command specific information */ unsigned char asc; /* ASC */ unsigned char ascq; /* ASCQ */ unsigned char rfu; /* FRU */ - unsigned char sns_key_info[3]; /* sense key specific infomation */ + unsigned char sns_key_info[3]; /* sense key specific information */ }; /* sd_ctl bit map */ diff --git a/trunk/drivers/staging/rts5139/sd.c b/trunk/drivers/staging/rts5139/sd.c index 703159599a19..0395bc30044b 100644 --- a/trunk/drivers/staging/rts5139/sd.c +++ b/trunk/drivers/staging/rts5139/sd.c @@ -1518,7 +1518,7 @@ static u8 sd_search_final_phase(struct rts51x_chip *chip, u32 phase_map, } Search_Finish: - RTS51X_DEBUGP("Final choosen phase: %d\n", final_phase); + RTS51X_DEBUGP("Final chosen phase: %d\n", final_phase); return final_phase; }