diff --git a/[refs] b/[refs] index 7e174bb32cd1..756fa5c0f788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2da8eab97544266020a8cddb2936237abbb93859 +refs/heads/master: 18552ea1322e218b43f7692d9358c930a6d81df1 diff --git a/trunk/drivers/media/pci/ivtv/ivtvfb.c b/trunk/drivers/media/pci/ivtv/ivtvfb.c index 05b94aa8ba32..9ff1230192e8 100644 --- a/trunk/drivers/media/pci/ivtv/ivtvfb.c +++ b/trunk/drivers/media/pci/ivtv/ivtvfb.c @@ -1171,8 +1171,7 @@ static void ivtvfb_release_buffers (struct ivtv *itv) fb_dealloc_cmap(&oi->ivtvfb_info.cmap); /* Release pseudo palette */ - if (oi->ivtvfb_info.pseudo_palette) - kfree(oi->ivtvfb_info.pseudo_palette); + kfree(oi->ivtvfb_info.pseudo_palette); #ifdef CONFIG_MTRR if (oi->fb_end_aligned_physaddr) {