diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 11:56:16 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 11:56:16 -0300 |
commit | 1739deb9fa270e49dbcaa25a95796b4927cc4a78 (patch) | |
tree | 0826713f0bccc8d9ecb8f972b09ac571ff1a5ffe /linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c | |
parent | 2ba96e655011fe3e04a32e5498ef82485b930c6f (diff) | |
parent | 313f7f3007cbbc618b5957b7e53e07ec1b4db88f (diff) | |
download | mediapointer-dvb-s2-1739deb9fa270e49dbcaa25a95796b4927cc4a78.tar.gz mediapointer-dvb-s2-1739deb9fa270e49dbcaa25a95796b4927cc4a78.tar.bz2 |
merge: http://kernellabs.com/hg/~dheitmueller/empire-fix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c')
-rw-r--r-- | linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c index 7127321ac..6b89f33a4 100644 --- a/linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c +++ b/linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c @@ -178,8 +178,10 @@ sensor_found: sens_priv->settings = kmalloc(sizeof(s32)*ARRAY_SIZE(s5k83a_ctrls), GFP_KERNEL); - if (!sens_priv->settings) + if (!sens_priv->settings) { + kfree(sens_priv); return -ENOMEM; + } sd->gspca_dev.cam.cam_mode = s5k83a_modes; sd->gspca_dev.cam.nmodes = ARRAY_SIZE(s5k83a_modes); |