diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /net/tipc/subscr.c | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'net/tipc/subscr.c')
| -rw-r--r-- | net/tipc/subscr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c index 0747d8a9232f..ac91f0dfa144 100644 --- a/net/tipc/subscr.c +++ b/net/tipc/subscr.c | |||
| @@ -364,9 +364,9 @@ static struct subscription *subscr_subscribe(struct tipc_subscr *s, | |||
| 364 | sub->seq.upper = htohl(s->seq.upper, swap); | 364 | sub->seq.upper = htohl(s->seq.upper, swap); |
| 365 | sub->timeout = htohl(s->timeout, swap); | 365 | sub->timeout = htohl(s->timeout, swap); |
| 366 | sub->filter = htohl(s->filter, swap); | 366 | sub->filter = htohl(s->filter, swap); |
| 367 | if ((!(sub->filter & TIPC_SUB_PORTS) | 367 | if ((!(sub->filter & TIPC_SUB_PORTS) == |
| 368 | == !(sub->filter & TIPC_SUB_SERVICE)) | 368 | !(sub->filter & TIPC_SUB_SERVICE)) || |
| 369 | || (sub->seq.lower > sub->seq.upper)) { | 369 | (sub->seq.lower > sub->seq.upper)) { |
| 370 | warn("Subscription rejected, illegal request\n"); | 370 | warn("Subscription rejected, illegal request\n"); |
| 371 | kfree(sub); | 371 | kfree(sub); |
| 372 | subscr_terminate(subscriber); | 372 | subscr_terminate(subscriber); |