Skip to content

Commit

Permalink
firmware: atm/ueagle-atm: prepare for FIRMWARE_NAME_MAX removal
Browse files Browse the repository at this point in the history
We're going to remove the FIRMWARE_NAME_MAX definition in order to avoid any
firmware name length restriction.
This patch replaces the shared FIRMWARE_NAME_MAX definition with a ueagle
local one.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Cc: Damien Bergamini <damien.bergamini@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Samuel Ortiz authored and Greg Kroah-Hartman committed Jun 16, 2009
1 parent 976821d commit ade901d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/usb/atm/ueagle-atm.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ enum {
#define FW_GET_BYTE(p) *((__u8 *) (p))

#define FW_DIR "ueagle-atm/"
#define UEA_FW_NAME_MAX 30
#define NB_MODEM 4

#define BULK_TIMEOUT 300
Expand Down Expand Up @@ -1564,17 +1565,17 @@ static void cmvs_file_name(struct uea_softc *sc, char *const cmv_name, int ver)
file = cmv_file[sc->modem_index];

strcpy(cmv_name, FW_DIR);
strlcat(cmv_name, file, FIRMWARE_NAME_MAX);
strlcat(cmv_name, file, UEA_FW_NAME_MAX);
if (ver == 2)
strlcat(cmv_name, ".v2", FIRMWARE_NAME_MAX);
strlcat(cmv_name, ".v2", UEA_FW_NAME_MAX);
}

static int request_cmvs_old(struct uea_softc *sc,
void **cmvs, const struct firmware **fw)
{
int ret, size;
u8 *data;
char cmv_name[FIRMWARE_NAME_MAX]; /* 30 bytes stack variable */
char cmv_name[UEA_FW_NAME_MAX]; /* 30 bytes stack variable */

cmvs_file_name(sc, cmv_name, 1);
ret = request_firmware(fw, cmv_name, &sc->usb_dev->dev);
Expand Down Expand Up @@ -1608,7 +1609,7 @@ static int request_cmvs(struct uea_softc *sc,
int ret, size;
u32 crc;
u8 *data;
char cmv_name[FIRMWARE_NAME_MAX]; /* 30 bytes stack variable */
char cmv_name[UEA_FW_NAME_MAX]; /* 30 bytes stack variable */

cmvs_file_name(sc, cmv_name, 2);
ret = request_firmware(fw, cmv_name, &sc->usb_dev->dev);
Expand Down

0 comments on commit ade901d

Please sign in to comment.