[JAUNTY] SRU: V4L/DVB (9667): Fixed typo in sizeof() causing NULL pointer OOPS

[Amit Kucheria]

On Tue, May 05, 2009 at 11:43:08AM -0500, Manoj Iyer wrote:
>
> rtg, thanks for pointing me to the upstream cherry pick.
>
> SRU JUSTIFICATION:
>
> IMPACT: Kernel oops during boot, saa7134 is initialized for AverMedia
> card.
> FIX: Fixed typo in sizeof() causing NULL pointer OOPS, cherry-pick from  
> upstream.
> TEST: A test kernel with sauce patch in  
> http://people.ubuntu.com/~manjo/lp316405-jaunty/
> was tested by the user and confirmed to fix the problem.
>
> The following changes since commit  
> f5b49085f2b571268c7c2261aabe68b43c75b8ef:
>   Brad Figg (1):
>         UBUNTU: SAUCE: Add information to recognize Toshiba Satellite Pro 
> M10 Alps Touchpad
>
> are available in the git repository at:
>
>   git://kernel.ubuntu.com/manjo/ubuntu-jaunty.git lp316405
>
> Oldrich Jedlicka (1):
>       V4L/DVB (9667): Fixed typo in sizeof() causing NULL pointer OOPS
>
>  drivers/media/video/saa7134/saa7134-cards.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
>
> From 6b73373559be4e21556d1326e4f7b37307f0182b Mon Sep 17 00:00:00 2001
> From: Oldrich Jedlicka <oldium.pro at seznam.cz>
> Date: Thu, 13 Nov 2008 22:03:00 -0300
> Subject: [PATCH] V4L/DVB (9667): Fixed typo in sizeof() causing NULL pointer OOPS
> MIME-Version: 1.0
> Content-Type: text/plain; charset=utf-8
> Content-Transfer-Encoding: 8bit
>
> Bug: 316405
> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/316405
>
> Signed-off-by: Oldřich Jedlička <oldium.pro at seznam.cz>
> Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
> (cherry picked from commit bdf398eb09e3f2e1fd1acb50960ce93fe380e847)
>
> Signed-off-by: Manoj Iyer <manoj.iyer at canonical.com>
> ---
>  drivers/media/video/saa7134/saa7134-cards.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
> index ddc5402..8635228 100644
> --- a/drivers/media/video/saa7134/saa7134-cards.c
> +++ b/drivers/media/video/saa7134/saa7134-cards.c
> @@ -6048,7 +6048,7 @@ static void saa7134_tuner_setup(struct saa7134_dev *dev)
>  		struct v4l2_priv_tun_config  xc2028_cfg;
>  		struct xc2028_ctrl           ctl;
>
> -		memset(&xc2028_cfg, 0, sizeof(ctl));
> +		memset(&xc2028_cfg, 0, sizeof(xc2028_cfg));
>  		memset(&ctl, 0, sizeof(ctl));
>
>  		ctl.fname   = XC2028_DEFAULT_FIRMWARE;
> -- 
> 1.6.0.4

Re-ACK.

-- 
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit at canonical.com
----------------------------------------------------------------------