Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304576
b: refs/heads/master
c: feb5680
h: refs/heads/master
v: v3
  • Loading branch information
Masanari Iida authored and Greg Kroah-Hartman committed May 9, 2012
1 parent ee10115 commit a424abd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 25c59c553828145860d983bdd8ee445c1209dd0a
refs/heads/master: feb5680e063fd39873e9e638937f1197d38a81ca
10 changes: 5 additions & 5 deletions trunk/drivers/staging/rts5139/rts51x_chip.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/rts5139/sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit a424abd

Please sign in to comment.