Commit 8a73f9da authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: struct vnt_private rename wFirmwareVersion to firmware_version 



Removing camel case

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03b7e354

drivers/staging/vt6656/device.h

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ struct vnt_private { 
	struct vnt_interrupt_buffer int_buf;



	/* Version control */

	u16 wFirmwareVersion;

	u16 firmware_version;

	u8 byLocalID;

	u8 byRFType;

	u8 byBBRxConf;

drivers/staging/vt6656/firmware.c

+5 −5
Original line number Diff line number Diff line
@@ -118,24 +118,24 @@ int vnt_check_firmware_version(struct vnt_private *priv) 
					0,

					MESSAGE_REQUEST_VERSION,

					2,

					(u8 *) &(priv->wFirmwareVersion));

					(u8 *)&priv->firmware_version);



	dev_dbg(&priv->usb->dev, "Firmware Version [%04x]\n",

						priv->wFirmwareVersion);

						priv->firmware_version);



	if (status != STATUS_SUCCESS) {

		dev_dbg(&priv->usb->dev, "Firmware Invalid.\n");

		return false;

	}

	if (priv->wFirmwareVersion == 0xFFFF) {

	if (priv->firmware_version == 0xFFFF) {

		dev_dbg(&priv->usb->dev, "In Loader.\n");

		return false;

	}



	dev_dbg(&priv->usb->dev, "Firmware Version [%04x]\n",

						priv->wFirmwareVersion);

						priv->firmware_version);



	if (priv->wFirmwareVersion < FIRMWARE_VERSION) {

	if (priv->firmware_version < FIRMWARE_VERSION) {

		/* branch to loader for download new firmware */

		vnt_firmware_branch_to_sram(priv);

		return false;