diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-22 21:25:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-22 21:25:34 +0100 |
| commit | 2af10844eb6ed104f9505bf3a7ba3ceb02264f31 (patch) | |
| tree | 8a00024ff525b22379ea90a78ac3222db5a73062 /arch/mips/kernel/cevt-r4k.c | |
| parent | USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004) (diff) | |
| parent | Linux 2.6.37-rc7 (diff) | |
| download | linux-2af10844eb6ed104f9505bf3a7ba3ceb02264f31.tar.xz linux-2af10844eb6ed104f9505bf3a7ba3ceb02264f31.zip | |
USB: Merge 2.6.37-rc5 into usb-next
This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/mips/kernel/cevt-r4k.c')
| -rw-r--r-- | arch/mips/kernel/cevt-r4k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c index 2f4d7a99bcc2..98c5a9737c14 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c @@ -32,7 +32,7 @@ static int mips_next_event(unsigned long delta, cnt = read_c0_count(); cnt += delta; write_c0_compare(cnt); - res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0; + res = ((int)(read_c0_count() - cnt) >= 0) ? -ETIME : 0; return res; } |