| Message ID | CAPgLHd9YkK2-nqympYoKb+OTWfkND+3SJYGw_vCRbN6VpXWZog@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Wei Yongjun <weiyj.lk@gmail.com> wrote: >From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > >The dereference should be moved below the NULL test. > >Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> >--- > drivers/input/touchscreen/cyttsp4_core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/drivers/input/touchscreen/cyttsp4_core.c >b/drivers/input/touchscreen/cyttsp4_core.c >index 963da05..ffa8e35 100644 >--- a/drivers/input/touchscreen/cyttsp4_core.c >+++ b/drivers/input/touchscreen/cyttsp4_core.c >@@ -1244,11 +1244,11 @@ static void cyttsp4_watchdog_timer(unsigned >long handle) > { > struct cyttsp4 *cd = (struct cyttsp4 *)handle; > >- dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__); >- > if (!cd) > return; > Actually this test does not make any sense and we should rather remove it. >+ dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__); >+ > if (!work_pending(&cd->watchdog_work)) > schedule_work(&cd->watchdog_work); > Hi Wei, Thanks.
On 08/26/2013 08:26 AM, Dmitry Torokhov wrote: > Wei Yongjun <weiyj.lk@gmail.com> wrote: >> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> >> >> The dereference should be moved below the NULL test. >> >> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> >> --- >> drivers/input/touchscreen/cyttsp4_core.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/input/touchscreen/cyttsp4_core.c >> b/drivers/input/touchscreen/cyttsp4_core.c >> index 963da05..ffa8e35 100644 >> --- a/drivers/input/touchscreen/cyttsp4_core.c >> +++ b/drivers/input/touchscreen/cyttsp4_core.c >> @@ -1244,11 +1244,11 @@ static void cyttsp4_watchdog_timer(unsigned >> long handle) >> { >> struct cyttsp4 *cd = (struct cyttsp4 *)handle; >> >> - dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__); >> - >> if (!cd) >> return; >> > Actually this test does not make any sense and we should rather remove it. Agreed on removing it. For cases "cd" can be NULL/invalid, watchdog already stopped: 1- in probe(), when timer set, cd allocated and NULL check done. 2- in probe(), in error path after timer set, watchdog stopped before "cd" freed 3- in cyttsp4_remove(), watchdog stopped before "cd" freed > >> + dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__); >> + >> if (!work_pending(&cd->watchdog_work)) >> schedule_work(&cd->watchdog_work); >> > Hi Wei, > Thanks. > This message and any attachments may contain Cypress (or its subsidiaries) confidential information. If it has been received in error, please advise the sender and immediately delete this message. -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c index 963da05..ffa8e35 100644 --- a/drivers/input/touchscreen/cyttsp4_core.c +++ b/drivers/input/touchscreen/cyttsp4_core.c @@ -1244,11 +1244,11 @@ static void cyttsp4_watchdog_timer(unsigned long handle) { struct cyttsp4 *cd = (struct cyttsp4 *)handle; - dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__); - if (!cd) return; + dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__); + if (!work_pending(&cd->watchdog_work)) schedule_work(&cd->watchdog_work);