summaryrefslogtreecommitdiffstats
path: root/drivers/staging/keucr
diff options
context:
space:
mode:
authorJohannes Schilling <of82ecuq@cip.cs.fau.de>2013-06-06 18:10:46 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-06 11:48:49 -0700
commit3fb91d1128ff8a211f0a2b4dec9ad34d33ce6316 (patch)
tree72fac7d806e5c151606d38d631b2af1e9c5e18b9 /drivers/staging/keucr
parent8be88040000705e6f26cc3f59b26fdd0efc7eae6 (diff)
downloadlinux-stable-3fb91d1128ff8a211f0a2b4dec9ad34d33ce6316.tar.gz
linux-stable-3fb91d1128ff8a211f0a2b4dec9ad34d33ce6316.tar.bz2
linux-stable-3fb91d1128ff8a211f0a2b4dec9ad34d33ce6316.zip
keucr: use more specific max_t(int, ..
as advised by checkpatch, changed generic max(..) to max_t(int, .. Signed-off-by: Laura Lawniczak <laura.lawniczak@googlemail.com> Signed-off-by: Johannes Schilling <of82ecuq@cip.cs.fau.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/keucr')
-rw-r--r--drivers/staging/keucr/transport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/keucr/transport.c b/drivers/staging/keucr/transport.c
index 1a8837df0766..ab1eccdee583 100644
--- a/drivers/staging/keucr/transport.c
+++ b/drivers/staging/keucr/transport.c
@@ -708,8 +708,8 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
} else {
residue = min(residue, transfer_length);
- scsi_set_resid(srb, max(scsi_get_resid(srb),
- (int) residue));
+ scsi_set_resid(srb, max_t(int, scsi_get_resid(srb),
+ residue));
}
}