From ca84d76aba81b337b6196a55d7cba7cd831d4b6c Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Mon, 28 Jan 2013 20:57:47 -0500 Subject: [PATCH] --- yaml --- r: 354278 b: refs/heads/master c: 3b1f315415d3e9b2648bec82c0c1cd9eff2d8743 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/fwserial/fwserial.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cca4dc4e9c4c..bee38b40e7a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d83561894db22ee9c40fdd85d49eb5ee573125cc +refs/heads/master: 3b1f315415d3e9b2648bec82c0c1cd9eff2d8743 diff --git a/trunk/drivers/staging/fwserial/fwserial.c b/trunk/drivers/staging/fwserial/fwserial.c index 5f5474376fc4..815c01119583 100644 --- a/trunk/drivers/staging/fwserial/fwserial.c +++ b/trunk/drivers/staging/fwserial/fwserial.c @@ -1683,8 +1683,7 @@ static void fwserial_virt_plug_complete(struct fwtty_peer *peer, /* reconfigure tx_fifo optimally for this peer */ spin_lock_bh(&port->lock); - port->max_payload = min3(peer->max_payload, peer->fifo_len, - MAX_ASYNC_PAYLOAD); + port->max_payload = min(peer->max_payload, peer->fifo_len); dma_fifo_change_tx_limit(&port->tx_fifo, port->max_payload); spin_unlock_bh(&peer->port->lock);