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); } }