From 6abc2c362c63e3fb6f3f135cb7f6a6bff554feea Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 4 Aug 2009 22:00:24 -0300 Subject: [PATCH] --- yaml --- r: 161515 b: refs/heads/master c: b807d17555dcc4ea28abadd4d647ba0c4d822cdb h: refs/heads/master i: 161513: 7afd30cfe75805f108ea6ecee117194fbc1da5c1 161511: bf380f8d6cfb47ca38a941657367ab3fd5ef8615 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/m5602/m5602_s5k83a.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dc4cd0271e52..62f9ed3c43dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46058128ff57db466ec132cb7de76cf9ecbd3dd3 +refs/heads/master: b807d17555dcc4ea28abadd4d647ba0c4d822cdb diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/trunk/drivers/media/video/gspca/m5602/m5602_s5k83a.c index 7127321ace8c..6b89f33a4ce0 100644 --- a/trunk/drivers/media/video/gspca/m5602/m5602_s5k83a.c +++ b/trunk/drivers/media/video/gspca/m5602/m5602_s5k83a.c @@ -178,8 +178,10 @@ int s5k83a_probe(struct sd *sd) 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);