diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/media/common/saa7146_fops.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/media/common/saa7146_fops.c')
| -rw-r--r-- | drivers/media/common/saa7146_fops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index 171afe7da6b6..cf6a817d5059 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
| @@ -563,7 +563,7 @@ int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev | |||
| 563 | 563 | ||
| 564 | DEB_EE(("dev:%p\n",dev)); | 564 | DEB_EE(("dev:%p\n",dev)); |
| 565 | 565 | ||
| 566 | if( VFL_TYPE_GRABBER == (*vid)->type ) { | 566 | if ((*vid)->vfl_type == VFL_TYPE_GRABBER) { |
| 567 | vv->video_minor = -1; | 567 | vv->video_minor = -1; |
| 568 | } else { | 568 | } else { |
| 569 | vv->vbi_minor = -1; | 569 | vv->vbi_minor = -1; |