From af2cef36097f1e4fa007946a6d290f509e3ea18f Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 19 Sep 2012 19:37:39 +0100 Subject: [PATCH] --- yaml --- r: 325478 b: refs/heads/master c: c8cad4c89ee3b15935c532210ae6ebb5c0a2734d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2b8111a82d41..42d8548f20e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f73fbcec27be8b074555e18d9f50c3013e4d802 +refs/heads/master: c8cad4c89ee3b15935c532210ae6ebb5c0a2734d diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index f496f4d96c83..c2a32cf95a82 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -1195,7 +1195,6 @@ static int do_cmd_ioctl(struct comedi_device *dev, goto cleanup; } - kfree(async->cmd.chanlist); async->cmd = cmd; async->cmd.data = NULL; /* load channel/gain list */ @@ -2033,6 +2032,8 @@ static void do_become_nonbusy(struct comedi_device *dev, if (async) { comedi_reset_async_buf(async); async->inttrig = NULL; + kfree(async->cmd.chanlist); + async->cmd.chanlist = NULL; } else { dev_err(dev->class_dev, "BUG: (?) do_become_nonbusy called with async=NULL\n");