aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-07-17 02:32:21 -0400
committerJeff Garzik <jeff@garzik.org>2007-07-17 16:18:01 -0400
commitb1734d2388cc45ecdec58615e35955d0d402f938 (patch)
tree22218bc7fb0428ac6566a056a7f76edf92b44cdd
parentea8b4db97aa41a66c05daa4055a1974692ccd52d (diff)
downloadkernel_samsung_crespo-b1734d2388cc45ecdec58615e35955d0d402f938.zip
kernel_samsung_crespo-b1734d2388cc45ecdec58615e35955d0d402f938.tar.gz
kernel_samsung_crespo-b1734d2388cc45ecdec58615e35955d0d402f938.tar.bz2
drivers/atm/ambassador: kill uninit'd var warning, and fix bug
An uninitialized variable warning illuminated an area where indeed the variable was being used without initialization. Unfortunately, after verifying all such paths were fixed, the warning still appears. So we follow the initialization practice of other variables in this function. Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/atm/ambassador.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index 59651ab..b34b382 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -1040,7 +1040,7 @@ static int amb_open (struct atm_vcc * atm_vcc)
struct atm_qos * qos;
struct atm_trafprm * txtp;
struct atm_trafprm * rxtp;
- u16 tx_rate_bits;
+ u16 tx_rate_bits = -1; // hush gcc
u16 tx_vc_bits = -1; // hush gcc
u16 tx_frame_bits = -1; // hush gcc
@@ -1096,6 +1096,8 @@ static int amb_open (struct atm_vcc * atm_vcc)
r = round_up;
}
error = make_rate (pcr, r, &tx_rate_bits, NULL);
+ if (error)
+ return error;
tx_vc_bits = TX_UBR_CAPPED;
tx_frame_bits = TX_FRAME_CAPPED;
}