---

yaml --- r: 354278 b: refs/heads/master c: 3b1f315 h: refs/heads/master v: v3
git-mirror · Jan 30, 2013 · ca84d76 · ca84d76
1 parent 92edeeb
commit ca84d76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);