diff --git a/[refs] b/[refs] index 78742c00a792..89ec92dd1011 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51b713a684d403bd672b3e4cac55db43dc5cca2d +refs/heads/master: dedd1325f1d53e2a2604457c4b3af9e62dde5001 diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index a252081b6a08..07456c0709dc 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -81,10 +81,8 @@ static void cleanup_device(comedi_device *dev) dev->subdevices = NULL; dev->n_subdevices = 0; } - if (dev->private) { - kfree(dev->private); - dev->private = NULL; - } + kfree(dev->private); + dev->private = NULL; dev->driver = 0; dev->board_name = NULL; dev->board_ptr = NULL;