diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
| commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
| tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /net/tipc/subscr.c | |
| parent | f5de24b06aa46427500d0fdbe8616b73a71d8c28 (diff) | |
| parent | 440b004cf953bec2bc8cd91c64ae707fd7e25327 (diff) | |
Merge remote branch 'alsa/fixes' into fix/hda
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); |