diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index aac59c03a732dc00db2f1f83a7657f0b39bcee9b..70d3917cc00364e71ca0900557c09fd02ce56bc3 100644
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -872,7 +872,7 @@ static inline void rndis_put_nr(int nr)
 struct rndis_params *rndis_register(void (*resp_avail)(void *v), void *v)
 {
 	struct rndis_params *params;
-	u8 i;
+	int i;
 
 	if (!resp_avail)
 		return ERR_PTR(-EINVAL);
@@ -923,7 +923,7 @@ EXPORT_SYMBOL_GPL(rndis_register);
 
 void rndis_deregister(struct rndis_params *params)
 {
-	u8 i;
+	int i;
 
 	pr_debug("%s:\n", __func__);
 
diff --git a/drivers/usb/gadget/function/rndis.h b/drivers/usb/gadget/function/rndis.h
index 194abb130e49a64a928560e4cbe08d2251c2d63f..ef92eb66d8adf91fac1cc7dea85490ebc2f0895a 100644
--- a/drivers/usb/gadget/function/rndis.h
+++ b/drivers/usb/gadget/function/rndis.h
@@ -177,7 +177,7 @@ typedef struct rndis_resp_t
 
 typedef struct rndis_params
 {
-	u8			confignr;
+	int			confignr;
 	u8			used;
 	u16			saved_filter;
 	enum rndis_state	state;