| Message ID | 20140305155418.GA32106@udknight (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/03/14 17:54, Wang YanQing wrote: > Because uvesafb_par is allocated as part of fb_info in uvesafb_probe, > so we don't need to do NULL check for both fb_info and uvesafb_par in > uvesafb_remove. > > [ This patch also fix a warning report by fengguang.wu@intel.com > "drivers/video/fbdev/uvesafb.c:1815 uvesafb_remove() > warn: variable dereferenced before check 'par'" ] > > Signed-off-by: Wang YanQing <udknight@gmail.com> > --- > drivers/video/fbdev/uvesafb.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c > index 1f38445..18352b2 100644 > --- a/drivers/video/fbdev/uvesafb.c > +++ b/drivers/video/fbdev/uvesafb.c > @@ -1812,11 +1812,9 @@ static int uvesafb_remove(struct platform_device *dev) > fb_destroy_modedb(info->monspecs.modedb); > fb_dealloc_cmap(&info->cmap); > > - if (par) { > - kfree(par->vbe_modes); > - kfree(par->vbe_state_orig); > - kfree(par->vbe_state_saved); > - } > + kfree(par->vbe_modes); > + kfree(par->vbe_state_orig); > + kfree(par->vbe_state_saved); > > framebuffer_release(info); > } > Thanks, queuing for 3.15. Tomi
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c index 1f38445..18352b2 100644 --- a/drivers/video/fbdev/uvesafb.c +++ b/drivers/video/fbdev/uvesafb.c @@ -1812,11 +1812,9 @@ static int uvesafb_remove(struct platform_device *dev) fb_destroy_modedb(info->monspecs.modedb); fb_dealloc_cmap(&info->cmap); - if (par) { - kfree(par->vbe_modes); - kfree(par->vbe_state_orig); - kfree(par->vbe_state_saved); - } + kfree(par->vbe_modes); + kfree(par->vbe_state_orig); + kfree(par->vbe_state_saved); framebuffer_release(info); }
Because uvesafb_par is allocated as part of fb_info in uvesafb_probe, so we don't need to do NULL check for both fb_info and uvesafb_par in uvesafb_remove. [ This patch also fix a warning report by fengguang.wu@intel.com "drivers/video/fbdev/uvesafb.c:1815 uvesafb_remove() warn: variable dereferenced before check 'par'" ] Signed-off-by: Wang YanQing <udknight@gmail.com> --- drivers/video/fbdev/uvesafb.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)