From ff420b2043127bbd191e4b791efbc7296566ba90 Mon Sep 17 00:00:00 2001 From: Amit Choudhary Date: Wed, 20 Dec 2006 09:30:45 -0300 Subject: [PATCH] --- yaml --- r: 45083 b: refs/heads/master c: d82d418a3af4d7d07151f9d45ca20f2ce61289a0 h: refs/heads/master i: 45081: a9d1707f3834f7356618b3b8937d319b5f563d68 45079: cc3576f47ba9953b38a8cfb95210810b07d52d2c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cpia2/cpia2_usb.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3c5de18ce1d3..e27497bfc301 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb2c7b4927c8f376b7ba9557978d8c59ed472664 +refs/heads/master: d82d418a3af4d7d07151f9d45ca20f2ce61289a0 diff --git a/trunk/drivers/media/video/cpia2/cpia2_usb.c b/trunk/drivers/media/video/cpia2/cpia2_usb.c index 28dc6a1a1e43..d8e929863a88 100644 --- a/trunk/drivers/media/video/cpia2/cpia2_usb.c +++ b/trunk/drivers/media/video/cpia2/cpia2_usb.c @@ -640,6 +640,10 @@ static int submit_urbs(struct camera_data *cam) cam->sbuf[i].data = kmalloc(FRAMES_PER_DESC * FRAME_SIZE_PER_DESC, GFP_KERNEL); if (!cam->sbuf[i].data) { + while (--i >= 0) { + kfree(cam->sbuf[i].data); + cam->sbuf[i].data = NULL; + } return -ENOMEM; } }