From c194e4cbd7e4b4dee560b2c2f77f3380647db059 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 5 May 2010 03:00:47 -0300
Subject: [PATCH] --- yaml --- r: 193158 b: refs/heads/master c:
 8b661b508b3a4c8d9fc7a4b10507d3f1172947c3 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/media/video/s2255drv.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9788037672d0..1a70847785d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aab9796f5580a988c46c130a727cdc398a05317b
+refs/heads/master: 8b661b508b3a4c8d9fc7a4b10507d3f1172947c3
diff --git a/trunk/drivers/media/video/s2255drv.c b/trunk/drivers/media/video/s2255drv.c
index 1f9a49e054a8..3c7a79f3812a 100644
--- a/trunk/drivers/media/video/s2255drv.c
+++ b/trunk/drivers/media/video/s2255drv.c
@@ -2528,10 +2528,7 @@ static int s2255_stop_acquire(struct s2255_dev *dev, unsigned long chn)
 static void s2255_stop_readpipe(struct s2255_dev *dev)
 {
 	struct s2255_pipeinfo *pipe = &dev->pipe;
-	if (dev == NULL) {
-		s2255_dev_err(&dev->udev->dev, "invalid device\n");
-		return;
-	}
+
 	pipe->state = 0;
 	if (pipe->stream_urb) {
 		/* cancel urb */