From c4bd14a952ba9d54f73939eae143408192bcde08 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 29 Jun 2012 17:39:45 -0700 Subject: [PATCH] --- yaml --- r: 317679 b: refs/heads/master c: 70fcd1b7a6be4f4f60f4d05beeb3976bb0eaf6a2 h: refs/heads/master i: 317677: b9f76e241b4e19402038c3d34b4beba5726e5c2c 317675: d75d277cf19efa2aae526a7dfd68afd80268152e 317671: af7aea1824dea734e7cc27bf51d691122eb98dd2 317663: 1acb6473dc93490d62e37b304dbb7491d6bafe35 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_670x.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f1db175fac89..9a615a5c2280 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 464c94514c703bc61c3f85db397582aa8f17cf9d +refs/heads/master: 70fcd1b7a6be4f4f60f4d05beeb3976bb0eaf6a2 diff --git a/trunk/drivers/staging/comedi/drivers/ni_670x.c b/trunk/drivers/staging/comedi/drivers/ni_670x.c index bab964477118..46f373a0c0ca 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_670x.c +++ b/trunk/drivers/staging/comedi/drivers/ni_670x.c @@ -301,8 +301,13 @@ static int ni_670x_attach(struct comedi_device *dev, static void ni_670x_detach(struct comedi_device *dev) { struct ni_670x_private *devpriv = dev->private; + struct comedi_subdevice *s; - kfree(dev->subdevices[0].range_table_list); + if (dev->n_subdevices) { + s = dev->subdevices + 0; + if (s) + kfree(s->range_table_list); + } if (devpriv && devpriv->mite) mite_unsetup(devpriv->mite); if (dev->irq)