Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 40ab9b65fae9..697ad82f6634 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1002,6 +1002,10 @@ static int fs_open(struct atm_vcc *atm_vcc)
                                         r = ROUND_UP;
                                 }
                                 error = make_rate (pcr, r, &tmc0, NULL);
+                                if (error) {
+                                        kfree(tc);
+                                        return error;
+                                }
                         }
                         fs_dprintk (FS_DEBUG_OPEN, "pcr = %d.\n", pcr);
                 }