> Hi Li Jun, Hi Li Jun, > > On Wed, Jan 08, 2014 at 05:06:21PM +0800, Li Jun wrote: > > This patch adds OTG fsm timers initialization, which use controller's > > 1ms interrupt as time out counter, also adds some local timers which > > are not in otg_fsm_timer list. > > > > Signed-off-by: Li Jun <b47624@xxxxxxxxxxxxx> > > --- > > drivers/usb/chipidea/otg_fsm.c | 111 +++++++++++++++++++++++++++++++++++++++- > > drivers/usb/chipidea/otg_fsm.h | 65 +++++++++++++++++++++++ > > 2 files changed, 175 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/usb/chipidea/otg_fsm.c > > b/drivers/usb/chipidea/otg_fsm.c index 31a046d..86bed68 100644 > > --- a/drivers/usb/chipidea/otg_fsm.c > > +++ b/drivers/usb/chipidea/otg_fsm.c > > @@ -33,7 +33,23 @@ static struct list_head active_timers; > > /* FSM timers */ > > struct ci_otg_fsm_timer *a_wait_vrise_tmr, *a_wait_vfall_tmr, *a_wait_bcon_tmr, > > *a_aidl_bdis_tmr, *a_bidl_adis_tmr, *b_ase0_brst_tmr, > > - *b_se0_srp_tmr, *b_srp_fail_tmr, *b_data_pulse_tmr; > > + *b_se0_srp_tmr, *b_srp_fail_tmr, *b_data_pulse_tmr, > > + *b_ssend_srp_tmr, *b_sess_vld_tmr; > > + > > One patch should not change code that another patch in that same series is introducing. These hunk seems to belong to the previous patch. > [Li Jun] You are right, I will re-split my patch set to resolve this, thanks! It's difficult to read the e-mails you reply. Please, consider to quote the text messages you're replying to. Br, David Cohen -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
