diff mbox

[-next,2/2] media/s2255drv: remove dead code

Message ID 20100505060047.GF27064@bicker (mailing list archive)
State Superseded, archived
Headers

Commit Message

Dan Carpenter May 5, 2010, 6 a.m. UTC 
  My concern initially was we dereference "dev" in the parameter list to
s2255_dev_err() but it turns out that code path is never used.  
The s2255_stop_readpipe() is only called from one place and "dev" is 
never null.  So this patch just removes the whole condition here.

Signed-off-by: Dan Carpenter <error27@gmail.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index ac9c40c..3c7a79f 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -2524,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 */