diff --git a/[refs] b/[refs] index 04862b037400..ee3267f41b66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f36d83a8cb7224f45fdfa1129a616dff56479a09 +refs/heads/master: 832855354b5863d141ecfc563e78063978c6f29f diff --git a/trunk/drivers/staging/rtl8712/usb_halinit.c b/trunk/drivers/staging/rtl8712/usb_halinit.c index f6569dce3012..0e9483bbabe1 100644 --- a/trunk/drivers/staging/rtl8712/usb_halinit.c +++ b/trunk/drivers/staging/rtl8712/usb_halinit.c @@ -37,7 +37,7 @@ u8 r8712_usb_hal_bus_init(struct _adapter *padapter) { u8 val8 = 0; u8 ret = _SUCCESS; - u8 PollingCnt = 20; + int PollingCnt = 20; struct registry_priv *pregistrypriv = &padapter->registrypriv; if (pregistrypriv->chip_version == RTL8712_FPGA) {