diff --git a/[refs] b/[refs] index ac51f926ef05..5cc8754b8e94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8eb1fdfff0c939f3f5c6b48a6e54996e7ac0ad91 +refs/heads/master: 7e7beb8c255e91bfb4701f2757036c8fbe5a6592 diff --git a/trunk/drivers/media/video/cx25821/cx25821-video.c b/trunk/drivers/media/video/cx25821/cx25821-video.c index 4d6907cda75b..79c455323d72 100644 --- a/trunk/drivers/media/video/cx25821/cx25821-video.c +++ b/trunk/drivers/media/video/cx25821/cx25821-video.c @@ -528,7 +528,6 @@ int cx25821_video_register(struct cx25821_dev *dev) #endif mutex_unlock(&dev->lock); - return 0; fail_unreg: