diff options
Diffstat (limited to 'drivers/firewire/sbp2.c')
| -rw-r--r-- | drivers/firewire/sbp2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index 8a8047db6980..68375bc3aef6 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c | |||
| @@ -1164,8 +1164,8 @@ static int sbp2_probe(struct device *dev) | |||
| 1164 | * specifies the max payload size as 2 ^ (max_payload + 2), so | 1164 | * specifies the max payload size as 2 ^ (max_payload + 2), so |
| 1165 | * if we set this to max_speed + 7, we get the right value. | 1165 | * if we set this to max_speed + 7, we get the right value. |
| 1166 | */ | 1166 | */ |
| 1167 | tgt->max_payload = min(device->max_speed + 7, 10U); | 1167 | tgt->max_payload = min3(device->max_speed + 7, 10U, |
| 1168 | tgt->max_payload = min(tgt->max_payload, device->card->max_receive - 1); | 1168 | device->card->max_receive - 1); |
| 1169 | 1169 | ||
| 1170 | /* Do the login in a workqueue so we can easily reschedule retries. */ | 1170 | /* Do the login in a workqueue so we can easily reschedule retries. */ |
| 1171 | list_for_each_entry(lu, &tgt->lu_list, link) | 1171 | list_for_each_entry(lu, &tgt->lu_list, link) |