diff mbox series

[v2] power: supply: cpcap-battery: fix invalid usage of list cursor

Message ID 20210421143650.16045-1-zhuguangqing83@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show
Series [v2] power: supply: cpcap-battery: fix invalid usage of list cursor | expand

Commit Message

guangqing zhu April 21, 2021, 2:36 p.m. UTC
From: Guangqing Zhu <zhuguangqing83@gmail.com>

Fix invalid usage of a list_for_each_entry in cpcap_battery_irq_thread().
Empty list or fully traversed list points to list head, which is not
NULL (and before the first element containing real data).

Signed-off-by: Guangqing Zhu <zhuguangqing83@gmail.com>
---
v2:
  - Modify commit message and code as suggested by Sebastian.
---
 drivers/power/supply/cpcap-battery.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tony Lindgren April 21, 2021, 4:04 p.m. UTC | #1
Hi,

* zhuguangqing83@gmail.com <zhuguangqing83@gmail.com> [210421 14:38]:
> From: Guangqing Zhu <zhuguangqing83@gmail.com>
> 
> Fix invalid usage of a list_for_each_entry in cpcap_battery_irq_thread().
> Empty list or fully traversed list points to list head, which is not
> NULL (and before the first element containing real data).
> 
> Signed-off-by: Guangqing Zhu <zhuguangqing83@gmail.com>
> ---
> v2:
>   - Modify commit message and code as suggested by Sebastian.

Thanks looks OK to me. Looks like there's no flag we need to set there when
the entry is found, so this should do for the check.

Hmm I wonder if this just might fix the issue where booting with a USB
charger connected can hang..

Reviewed-by: Tony Lindgren <tony@atomide.com>

> ---
>  drivers/power/supply/cpcap-battery.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
> index 6d5bcdb9f45d..a3fc0084cda0 100644
> --- a/drivers/power/supply/cpcap-battery.c
> +++ b/drivers/power/supply/cpcap-battery.c
> @@ -786,7 +786,7 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)
>  			break;
>  	}
>  
> -	if (!d)
> +	if (list_entry_is_head(d, &ddata->irq_list, node))
>  		return IRQ_NONE;
>  
>  	latest = cpcap_battery_latest(ddata);
> -- 
> 2.17.1
>
Carl Philipp Klemm April 21, 2021, 5:19 p.m. UTC | #2
Looks good to me, but dosent appear to solve the bootup bug.

(this time reply all)

Reviewed-by: Carl Philipp Klemm <philipp@uvos.xyz>
Tested-by: Carl Philipp Klemm <philipp@uvos.xyz>
Sebastian Reichel April 21, 2021, 9:09 p.m. UTC | #3
Hi,

On Wed, Apr 21, 2021 at 07:19:33PM +0200, Carl Philipp Klemm wrote:
> Tony Lindgren <tony@atomide.com> wrote:
> > * zhuguangqing83@gmail.com <zhuguangqing83@gmail.com> [210421 14:38]:
> > > From: Guangqing Zhu <zhuguangqing83@gmail.com>
> > > 
> > > Fix invalid usage of a list_for_each_entry in cpcap_battery_irq_thread().
> > > Empty list or fully traversed list points to list head, which is not
> > > NULL (and before the first element containing real data).
> > > 
> > > Signed-off-by: Guangqing Zhu <zhuguangqing83@gmail.com>
> > > ---
> > > v2:
> > >   - Modify commit message and code as suggested by Sebastian.
> > 
> > Thanks looks OK to me. Looks like there's no flag we need to set there when
> > the entry is found, so this should do for the check.
> > 
> > Hmm I wonder if this just might fix the issue where booting with a USB
> > charger connected can hang..
> > 
> > Reviewed-by: Tony Lindgren <tony@atomide.com>
>
> Looks good to me, but dosent appear to solve the bootup bug.
> 
> (this time reply all)
> 
> Reviewed-by: Carl Philipp Klemm <philipp@uvos.xyz>
> Tested-by: Carl Philipp Klemm <philipp@uvos.xyz>

Thanks, queued.

-- Sebastian

> > >  drivers/power/supply/cpcap-battery.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
> > > index 6d5bcdb9f45d..a3fc0084cda0 100644
> > > --- a/drivers/power/supply/cpcap-battery.c
> > > +++ b/drivers/power/supply/cpcap-battery.c
> > > @@ -786,7 +786,7 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)
> > >  			break;
> > >  	}
> > >  
> > > -	if (!d)
> > > +	if (list_entry_is_head(d, &ddata->irq_list, node))
> > >  		return IRQ_NONE;
> > >  
> > >  	latest = cpcap_battery_latest(ddata);
> > > -- 
> > > 2.17.1
> > >
diff mbox series

Patch

diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
index 6d5bcdb9f45d..a3fc0084cda0 100644
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -786,7 +786,7 @@  static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)
 			break;
 	}
 
-	if (!d)
+	if (list_entry_is_head(d, &ddata->irq_list, node))
 		return IRQ_NONE;
 
 	latest = cpcap_battery_latest(ddata);