From ca19524dddcee346620fd0eb108c5e34d9d5fcc6 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 18 Apr 2013 14:34:00 -0700 Subject: [PATCH] --- yaml --- r: 364161 b: refs/heads/master c: 3fd19714e3b7b355cb52975edaeb25df6db4a9be h: refs/heads/master i: 364159: 83ca425297435a54384e5c1baf7df1d3c293e499 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/skel.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fb612476ae43..72d103f4a359 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60cb3b02bc74c90aaa77d1acda1eff73c8dda478 +refs/heads/master: 3fd19714e3b7b355cb52975edaeb25df6db4a9be diff --git a/trunk/drivers/staging/comedi/drivers/skel.c b/trunk/drivers/staging/comedi/drivers/skel.c index 6dc77fc07220..dbc8c54d6da7 100644 --- a/trunk/drivers/staging/comedi/drivers/skel.c +++ b/trunk/drivers/staging/comedi/drivers/skel.c @@ -632,11 +632,12 @@ static void skel_detach(struct comedi_device *dev) /* * ISA board * - * If I/O regions successfully requested by _attach(), - * release them here. + * Release the first I/O region requested during the + * _attach(). This is safe to call even if the request + * failed. If any additional I/O regions are requested + * they need to be released by the driver. */ - if (dev->iobase) - release_region(dev->iobase, SKEL_SIZE); + comedi_legacy_detach(dev); } }