aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-30 00:29:57 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-30 00:29:57 -0400
commit2d408b42ed0a287c64a94b48e24c6bfa95035019 (patch)
treedba39d735ce0051deadfd4d887637de33dfe842c /drivers/net/irda
parentfde937d826e43c9fe7fecc98b6f3da7188e76930 (diff)
parent5f0212174db33828f8bddcff501b73d2bc734f72 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IRDA]: fix printk format [NETPOLL] netconsole: fix soft lockup when removing module [NETPOLL]: tx lock deadlock fix SCTP: lock_sock_nested in sctp_sock_migrate SCTP: Fix sctp_getsockopt_get_peer_addrs SCTP: update sctp_getsockopt helpers to allow oversized buffers
Diffstat (limited to 'drivers/net/irda')
-rw-r--r--drivers/net/irda/irport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 3098960dc2a1..3078c419cb02 100644
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -509,7 +509,7 @@ static void irport_timeout(struct net_device *dev)
509 IRDA_DEBUG(0, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n", 509 IRDA_DEBUG(0, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n",
510 __FUNCTION__, iir, lsr, iobase); 510 __FUNCTION__, iir, lsr, iobase);
511 511
512 IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%d\n", 512 IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%td\n",
513 __FUNCTION__, self->transmitting, self->tx_buff.len, 513 __FUNCTION__, self->transmitting, self->tx_buff.len,
514 self->tx_buff.data - self->tx_buff.head); 514 self->tx_buff.data - self->tx_buff.head);
515 515