Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7adcdb4c authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller
Browse files

drivers/atm/solos-pci.c: fix warning/bug, clean up code 



drivers/atm/solos-pci.c: In function 'flash_upgrade':
drivers/atm/solos-pci.c:528: warning: 'fw_name' may be used uninitialized in this function

Cc: Chas Williams <chas@cmf.nrl.navy.mil>
Cc: David Woodhouse <David.Woodhouse@intel.com>
Cc: Nathan Williams <nathan@traverse.com.au>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-By: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63ae93a1

drivers/atm/solos-pci.c

+16 −13
Original line number Diff line number Diff line
@@ -531,34 +531,37 @@ static int flash_upgrade(struct solos_card *card, int chip) 
	int numblocks = 0;

	int offset;



	if (chip == 0) {

	switch (chip) {

	case 0:

		fw_name = "solos-FPGA.bin";

		blocksize = FPGA_BLOCK;

	} 

	

	if (chip == 1) {

		break;

	case 1:

		fw_name = "solos-Firmware.bin";

		blocksize = SOLOS_BLOCK;

	}

	

	if (chip == 2){

		break;

	case 2:

		if (card->fpga_version > LEGACY_BUFFERS){

			fw_name = "solos-db-FPGA.bin";

			blocksize = FPGA_BLOCK;

		} else {

			dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");

			dev_info(&card->dev->dev, "FPGA version doesn't support"

					" daughter board upgrades\n");

			return -EPERM;

		}

	}

	

	if (chip == 3){

		break;

	case 3:

		if (card->fpga_version > LEGACY_BUFFERS){

			fw_name = "solos-Firmware.bin";

			blocksize = SOLOS_BLOCK;

		} else {

		dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");

			dev_info(&card->dev->dev, "FPGA version doesn't support"

					" daughter board upgrades\n");

			return -EPERM;

		}

		break;

	default:

		return -ENODEV;

	}



	if (request_firmware(&fw, fw_name, &card->dev->dev))