diff --git a/[refs] b/[refs]
index e1e2619fd6fb..5d12fe2e3124 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32273f50608e9b98116622e32187cbd139c09716
+refs/heads/master: 04b7fc4dec4fcb61dbe022bbaffda8ea37c39430
diff --git a/trunk/drivers/net/irda/sa1100_ir.c b/trunk/drivers/net/irda/sa1100_ir.c
index 86d296ed69a7..be67bdc0ca02 100644
--- a/trunk/drivers/net/irda/sa1100_ir.c
+++ b/trunk/drivers/net/irda/sa1100_ir.c
@@ -877,7 +877,7 @@ static int sa1100_irda_probe(struct platform_device *pdev)
 	err = sa1100_irda_init_iobuf(&si->rx_buff, 14384);
 	if (err)
 		goto err_mem_5;
-	err = sa1100_irda_init_iobuf(&si->tx_buff, 4000);
+	err = sa1100_irda_init_iobuf(&si->tx_buff, IRDA_SIR_MAX_FRAME);
 	if (err)
 		goto err_mem_5;