diff --git a/[refs] b/[refs]
index d1858e184996..cca4dc4e9c4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d110d92961317c1f289396473be3c26d01f171c
+refs/heads/master: d83561894db22ee9c40fdd85d49eb5ee573125cc
diff --git a/trunk/drivers/staging/fwserial/fwserial.h b/trunk/drivers/staging/fwserial/fwserial.h
index e157318cb7da..953ece69c10d 100644
--- a/trunk/drivers/staging/fwserial/fwserial.h
+++ b/trunk/drivers/staging/fwserial/fwserial.h
@@ -377,8 +377,8 @@ static inline void fwtty_bind_console(struct fwtty_port *port,
  */
 static inline int link_speed_to_max_payload(unsigned speed)
 {
-	speed = clamp(speed, (unsigned) SCODE_100, (unsigned) SCODE_800);
-	return 1 << (speed + 9);
+	/* Max async payload is 4096 - see IEEE 1394-2008 tables 6-4, 16-18 */
+	return min(512 << speed, 4096);
 }
 
 #endif /* _FIREWIRE_FWSERIAL_H */