aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.ravnborg.org>2006-07-03 23:24:23 +0200
committerSam Ravnborg <sam@mars.ravnborg.org>2006-07-03 23:24:23 +0200
commit05668381140309088443bf5dc53add4104610fbb (patch)
treeed53039717390e1a71ff16209281b1f1c8d3e6be /drivers/media/video/pvrusb2/pvrusb2-wm8775.c
parentkbuild: explicit turn off gcc stack-protector (diff)
parent[PATCH] genirq: Fixup ARM devel merge (diff)
downloadlinux-dev-05668381140309088443bf5dc53add4104610fbb.tar.xz
linux-dev-05668381140309088443bf5dc53add4104610fbb.zip
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-wm8775.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-wm8775.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
index fcad346e3955..2413e5198e16 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
@@ -89,7 +89,7 @@ static unsigned int wm8775_describe(struct pvr2_v4l_wm8775 *ctxt,
static void wm8775_detach(struct pvr2_v4l_wm8775 *ctxt)
{
- ctxt->client->handler = 0;
+ ctxt->client->handler = NULL;
kfree(ctxt);
}