diff --git a/[refs] b/[refs] index 8cd03d87d740..fb612476ae43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21208519d42404150fef42283a20192ffe08b0af +refs/heads/master: 60cb3b02bc74c90aaa77d1acda1eff73c8dda478 diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c index dc35cc9fb081..297750bef0f7 100644 --- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c @@ -292,14 +292,8 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it) static void dio200_detach(struct comedi_device *dev) { - const struct dio200_board *thisboard = comedi_board(dev); - struct dio200_private *devpriv = dev->private; - - if (!thisboard || !devpriv) - return; amplc_dio200_common_detach(dev); - if (devpriv->io.regtype == io_regtype) - release_region(devpriv->io.u.iobase, thisboard->mainsize); + comedi_legacy_detach(dev); } static struct comedi_driver amplc_dio200_driver = {