diff --git a/[refs] b/[refs] index 75ba3d5228ef..f6e903f6a243 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a4e5e2033eb7558ebe307e46f5fb6e63b92cab8 +refs/heads/master: 3e0c0ac84c01f41fb266bcdd2802708409901bed diff --git a/trunk/drivers/atm/zatm.c b/trunk/drivers/atm/zatm.c index c491ec455cac..083c5d3f2e18 100644 --- a/trunk/drivers/atm/zatm.c +++ b/trunk/drivers/atm/zatm.c @@ -800,6 +800,7 @@ static int alloc_shaper(struct atm_dev *dev,int *pcr,int min,int max,int ubr) i = m = 1; zatm_dev->ubr_ref_cnt++; zatm_dev->ubr = shaper; + *pcr = 0; } else { if (min) {