diff options
author | Steve French <sfrench@us.ibm.com> | 2006-03-03 11:27:25 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-03-03 11:27:25 +0000 |
commit | c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a (patch) | |
tree | 99b48ef0f5217fddc0aa897d9e60d95ace7da6ff /drivers/ieee1394/video1394.c | |
parent | 13298defe5323c7fdcac268f588d8d1090758fb8 (diff) | |
parent | c499ec24c31edf270e777a868ffd0daddcfe7ebd (diff) | |
download | op-kernel-dev-c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a.zip op-kernel-dev-c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a.tar.gz |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 39fb883..216dbbf 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; |