Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 925e277f authored by Wolfram Sang's avatar Wolfram Sang Committed by David S. Miller
Browse files

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: default avatarWolfram Sang <w.sang@pengutronix.de>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18a31e1e

net/irda/irttp.c

+5 −4
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ EXPORT_SYMBOL(irttp_close_tsap); 
 */

int irttp_udata_request(struct tsap_cb *self, struct sk_buff *skb)

{

	int ret = -1;

	int ret;



	IRDA_ASSERT(self != NULL, return -1;);

	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) 


	/* Check that nothing bad happens */

	if (!self->connected) {

		IRDA_DEBUG(1, "%s(), Not connected\n", __func__);

		IRDA_WARNING("%s(), Not connected\n", __func__);

		ret = -ENOTCONN;

		goto err;

	}



	if (skb->len > self->max_seg_size) {

		IRDA_DEBUG(1, "%s(), UData is too large for IrLAP!\n",

			   __func__);

		IRDA_ERROR("%s(), UData is too large for IrLAP!\n", __func__);

		ret = -EMSGSIZE;

		goto err;

	}