From 21f42f335cfd442e3b9d240a28d313354873388d Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sat, 9 Feb 2008 19:47:52 -0300
Subject: [PATCH] --- yaml --- r: 92765 b: refs/heads/master c:
 e6d1186543784222024da9c688766effd2ca3163 h: refs/heads/master i:   92763:
 27a15a947bfce5951cf9ca15d1daed1ac0cce93c v: v3

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

diff --git a/[refs] b/[refs]
index 1673c8aad5d4..195504bed0c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5317b17f6ca74531a6c707873dc5d25f1877ac3
+refs/heads/master: e6d1186543784222024da9c688766effd2ca3163
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c
index 1a7c3ddace07..58ef5caba83a 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c
@@ -405,7 +405,7 @@ struct pvr2_dvb_adapter *pvr2_dvb_create(struct pvr2_context *pvr)
 	if (!pvr->hdw->hdw_desc->dvb_props) {
 		/* Device lacks a digital interface so don't set up
 		   the DVB side of the driver either.  For now. */
-		return 0;
+		return NULL;
 	}
 	adap = kzalloc(sizeof(*adap), GFP_KERNEL);
 	if (!adap) return adap;