| Message ID | 20180130153359.524-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Samuel Ortiz |
| Headers | show |
Hi Colin, On Tue, Jan 30, 2018 at 03:33:59PM +0000, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The u8 variable max_size is being assigned a return value from the > call to nci_conn_max_data_pkt_payload_size that can return a -ve > error return. Since max_size is a u8, the -ve check for the error will > always be false. Fix this by making max_size an int type. > > Detected using Coccinelle: > drivers/nfc/fdp/fdp.c:208:5-13: WARNING: Unsigned expression compared > with zero: max_size <= 0 > > Fixes: a06347c04c13 ("NFC: Add Intel Fields Peak NFC solution driver") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/nfc/fdp/fdp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to nfc-next, thanks. Cheers, Samuel.
diff --git a/drivers/nfc/fdp/fdp.c b/drivers/nfc/fdp/fdp.c index d5784a47fc13..5ddc01b4913a 100644 --- a/drivers/nfc/fdp/fdp.c +++ b/drivers/nfc/fdp/fdp.c @@ -192,8 +192,8 @@ static int fdp_nci_send_patch(struct nci_dev *ndev, u8 conn_id, u8 type) const struct firmware *fw; struct sk_buff *skb; unsigned long len; - u8 max_size, payload_size; - int rc = 0; + u8 payload_size; + int max_size, rc = 0; if ((type == NCI_PATCH_TYPE_OTP && !info->otp_patch) || (type == NCI_PATCH_TYPE_RAM && !info->ram_patch))