diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /drivers/media/video/se401.c | |
| parent | 9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff) | |
| parent | f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'drivers/media/video/se401.c')
| -rw-r--r-- | drivers/media/video/se401.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index f481277892da..acceed5d04ae 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c | |||
| @@ -1397,7 +1397,7 @@ static int se401_probe(struct usb_interface *intf, | |||
| 1397 | mutex_init(&se401->lock); | 1397 | mutex_init(&se401->lock); |
| 1398 | wmb(); | 1398 | wmb(); |
| 1399 | 1399 | ||
| 1400 | if (video_register_device(&se401->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { | 1400 | if (video_register_device(&se401->vdev, VFL_TYPE_GRABBER, video_nr) < 0) { |
| 1401 | kfree(se401); | 1401 | kfree(se401); |
| 1402 | err("video_register_device failed"); | 1402 | err("video_register_device failed"); |
| 1403 | return -EIO; | 1403 | return -EIO; |