---

yaml --- r: 161496 b: refs/heads/master c: 085575a h: refs/heads/master v: v3
git-mirror · Sep 12, 2009 · 3358112 · 3358112
1 parent e6a3754
commit 3358112
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5d887ae60ea1b05fcdab65e51e1ef88398ed274
+refs/heads/master: 085575a325de87b4931a43c9d0a75ca0d3ba5075
diff --git a/trunk/drivers/media/video/stv680.c b/trunk/drivers/media/video/stv680.c
@@ -734,17 +734,18 @@ static int stv680_start_stream (struct usb_stv *stv680)
 	return 0;
 
  nomem_err:
-	for (i = 0; i < STV680_NUMSCRATCH; i++) {
-		kfree(stv680->scratch[i].data);
-		stv680->scratch[i].data = NULL;
-	}
 	for (i = 0; i < STV680_NUMSBUF; i++) {
 		usb_kill_urb(stv680->urb[i]);
 		usb_free_urb(stv680->urb[i]);
 		stv680->urb[i] = NULL;
 		kfree(stv680->sbuf[i].data);
 		stv680->sbuf[i].data = NULL;
 	}
+	/* used in irq, free only as all URBs are dead */
+	for (i = 0; i < STV680_NUMSCRATCH; i++) {
+		kfree(stv680->scratch[i].data);
+		stv680->scratch[i].data = NULL;
+	}
 	return -ENOMEM;
 
 }