From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760419AbZEZWui (ORCPT ); Tue, 26 May 2009 18:50:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760168AbZEZWtT (ORCPT ); Tue, 26 May 2009 18:49:19 -0400 Received: from mga06.intel.com ([134.134.136.21]:21407 "EHLO orsmga101.jf.intel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1760147AbZEZWtS (ORCPT ); Tue, 26 May 2009 18:49:18 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.41,254,1241420400"; d="scan'208";a="519075864" Message-Id: <20090526225127.744840145@linux.intel.com> References: <20090526224930.145059254@linux.intel.com> User-Agent: quilt/0.46-1 Date: Wed, 27 May 2009 00:49:32 +0200 From: Samuel Ortiz To: inux-kernel , Greg Kroah-Hartmann , Andrew Morton , Damien Bergamini Cc: Kay Sievers , Samuel Ortiz Subject: [PATCH 2/7 v2] atm/ueagle-atm: prepare for FIRMWARE_NAME_MAX removal Content-Disposition: inline; filename=firmware-ueagle.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Samuel Ortiz To: Damien Bergamini 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 --- drivers/usb/atm/ueagle-atm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) Index: iwm-2.6/drivers/usb/atm/ueagle-atm.c =================================================================== --- iwm-2.6.orig/drivers/usb/atm/ueagle-atm.c 2009-05-26 17:11:36.000000000 +0200 +++ iwm-2.6/drivers/usb/atm/ueagle-atm.c 2009-05-26 17:11:44.000000000 +0200 @@ -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 @@ -1564,9 +1565,9 @@ static void cmvs_file_name(struct uea_so 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, @@ -1574,7 +1575,7 @@ static int request_cmvs_old(struct uea_s { 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); @@ -1608,7 +1609,7 @@ static int request_cmvs(struct uea_softc 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); -- Intel Open Source Technology Centre http://oss.intel.com/