Merge 3.7-rc3 into staging-next

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

diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index 0369996a3839e9646b2e9b2396bdd3a099580b0e..6ffb39c3931445b4adb07c334479a060ef12c2bc 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -322,6 +322,8 @@ static void pc263_detach(struct comedi_device *dev)
 {
        const struct pc263_board *thisboard = comedi_board(dev);
 
+       if (!thisboard)
+               return;
        if (is_isa_board(thisboard)) {
                if (dev->iobase)
                        release_region(dev->iobase, PC263_IO_SIZE);