diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2010-11-16 04:40:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-18 15:24:25 -0500 |
commit | 925e277f5221defdc53cbef1ac3ed1803fa32357 (patch) | |
tree | 5d11dc5bf2e6ca2ef848a3722c9270e59e4def67 /net/irda | |
parent | 18a31e1e282f9ed563b131526a88162ccbe04ee3 (diff) |
net: irda: irttp: sync error paths of data- and udata-requests
irttp_data_request() returns meaningful errorcodes, while irttp_udata_request()
just returns -1 in similar situations. Sync the two and the loglevels of the
accompanying output.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
-rw-r--r-- | net/irda/irttp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/irda/irttp.c b/net/irda/irttp.c index 6cfaeaf2a370..f6054f9ccbe3 100644 --- a/net/irda/irttp.c +++ b/net/irda/irttp.c | |||
@@ -550,7 +550,7 @@ EXPORT_SYMBOL(irttp_close_tsap); | |||
550 | */ | 550 | */ |
551 | int irttp_udata_request(struct tsap_cb *self, struct sk_buff *skb) | 551 | int irttp_udata_request(struct tsap_cb *self, struct sk_buff *skb) |
552 | { | 552 | { |
553 | int ret = -1; | 553 | int ret; |
554 | 554 | ||
555 | IRDA_ASSERT(self != NULL, return -1;); | 555 | IRDA_ASSERT(self != NULL, return -1;); |
556 | IRDA_ASSERT(self->magic == TTP_TSAP_MAGIC, return -1;); | 556 | IRDA_ASSERT(self->magic == TTP_TSAP_MAGIC, return -1;); |
@@ -566,13 +566,14 @@ int irttp_udata_request(struct tsap_cb *self, struct sk_buff *skb) | |||
566 | 566 | ||
567 | /* Check that nothing bad happens */ | 567 | /* Check that nothing bad happens */ |
568 | if (!self->connected) { | 568 | if (!self->connected) { |
569 | IRDA_DEBUG(1, "%s(), Not connected\n", __func__); | 569 | IRDA_WARNING("%s(), Not connected\n", __func__); |
570 | ret = -ENOTCONN; | ||
570 | goto err; | 571 | goto err; |
571 | } | 572 | } |
572 | 573 | ||
573 | if (skb->len > self->max_seg_size) { | 574 | if (skb->len > self->max_seg_size) { |
574 | IRDA_DEBUG(1, "%s(), UData is too large for IrLAP!\n", | 575 | IRDA_ERROR("%s(), UData is too large for IrLAP!\n", __func__); |
575 | __func__); | 576 | ret = -EMSGSIZE; |
576 | goto err; | 577 | goto err; |
577 | } | 578 | } |
578 | 579 | ||