Commit a7e58591 authored Sep 12, 2017 by Liam Ryan Committed by Greg Kroah-Hartman Sep 17, 2017

staging: rtl8712: Fix unbalanced braces around else statement



Fix checkpath-reported unbalanced braces in the following areas

221: FILE: drivers/staging/rtl8712/hal_init.c:221:
392: FILE: drivers/staging/rtl8712/os_intfs.c:392:
363: FILE: drivers/staging/rtl8712/rtl8712_cmd.c:363:
889: FILE: drivers/staging/rtl8712/rtl8712_recv.c:889:
902: FILE: drivers/staging/rtl8712/rtl871x_cmd.c:902:
84: FILE: drivers/staging/rtl8712/rtl871x_ioctl_set.c:84:
580: FILE: drivers/staging/rtl8712/rtl871x_mlme.c:580:
593: FILE: drivers/staging/rtl8712/usb_intf.c:593:

Signed-off-by: Liam Ryan <liamryandev@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2af630f0

drivers/staging/rtl8712/hal_init.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -216,9 +216,9 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
		emem_sz = fwhdr.img_SRAM_size;
		do {
		memset(ptx_desc, 0, TXDESC_SIZE);
		if (emem_sz > MAX_DUMP_FWSZ) /* max=48k */
		if (emem_sz > MAX_DUMP_FWSZ) { /* max=48k */
		dump_emem_sz = MAX_DUMP_FWSZ;
		else {
		} else {
		dump_emem_sz = emem_sz;
		ptx_desc->txdw0 \|= cpu_to_le32(BIT(28));
		}

drivers/staging/rtl8712/os_intfs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -385,11 +385,11 @@ static int netdev_open(struct net_device *pnetdev)
		padapter->bup = true;
		if (rtl871x_hal_init(padapter) != _SUCCESS)
		goto netdev_open_error;
		if (!r8712_initmac)
		if (!r8712_initmac) {
		/* Use the mac address stored in the Efuse */
		memcpy(pnetdev->dev_addr,
		padapter->eeprompriv.mac_addr, ETH_ALEN);
		else {
		} else {
		/* We have to inform f/w to use user-supplied MAC
		* address.
		*/

drivers/staging/rtl8712/rtl8712_cmd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -356,11 +356,11 @@ int r8712_cmd_thread(void *context)
		if ((wr_sz % 64) == 0)
		blnPending = 1;
		}
		if (blnPending) /* 32 bytes for TX Desc - 8 offset */
		if (blnPending) { /* 32 bytes for TX Desc - 8 offset */
		pdesc->txdw0 \|= cpu_to_le32(((TXDESC_SIZE +
		OFFSET_SZ + 8) << OFFSET_SHT) &
		0x00ff0000);
		else {
		} else {
		pdesc->txdw0 \|= cpu_to_le32(((TXDESC_SIZE +
		OFFSET_SZ) <<
		OFFSET_SHT) &

drivers/staging/rtl8712/rtl8712_recv.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -883,10 +883,10 @@ static void query_rx_phy_status(struct _adapter *padapter,
		* from 0~100. It is assigned to the BSS List in
		* GetValueFromBeaconOrProbeRsp().
		*/
		if (bcck_rate)
		if (bcck_rate) {
		prframe->u.hdr.attrib.signal_strength =
		(u8)r8712_signal_scale_mapping(pwdb_all);
		else {
		} else {
		if (rf_rx_num != 0)
		prframe->u.hdr.attrib.signal_strength =
		(u8)(r8712_signal_scale_mapping(total_rssi /=

drivers/staging/rtl8712/rtl871x_cmd.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -899,9 +899,10 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
		if (!pwlan)
		goto createbss_cmd_fail;
		pwlan->last_scanned = jiffies;
		} else
		} else {
		list_add_tail(&(pwlan->list),
		&pmlmepriv->scanned_queue.queue);
		}
		pnetwork->Length = r8712_get_wlan_bssid_ex_sz(pnetwork);
		memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
		pwlan->fixed = true;