diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 17:53:56 +0100 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 17:53:56 +0100 |
commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /drivers/ieee1394/video1394.c | |
parent | Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kern... (diff) | |
parent | [PATCH] powerpc: Fix bug in bug fix for bug in lmb_alloc() (diff) | |
download | linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.xz linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/ieee1394/video1394.c')
-rw-r--r-- | drivers/ieee1394/video1394.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 39fb88309e8e..216dbbf1dc8e 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -744,7 +744,7 @@ static int __video1394_ioctl(struct file *file, if (i == ISO_CHANNELS) { PRINT(KERN_ERR, ohci->host->id, "No free channel found"); - return EAGAIN; + return -EAGAIN; } if (!(ohci->ISO_channel_usage & mask)) { v.channel = i; |