Merge 3.7-rc3 into staging-next

[karo-tx-linux.git] / drivers / staging / comedi / drivers / ni_labpc.c

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 40012506334f77a670f1c7360df7f0ef9e92dfd5..ab51c2678b9d425762d182951d6a183ba0cb585f 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -778,6 +778,8 @@ void labpc_common_detach(struct comedi_device *dev)
        struct labpc_private *devpriv = dev->private;
        struct comedi_subdevice *s;
 
+       if (!thisboard)
+               return;
        if (dev->subdevices) {
                s = &dev->subdevices[2];
                subdev_8255_cleanup(dev, s);