diff --git a/[refs] b/[refs] index 4f3839d7b53d..74eaa33ba491 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53510352587c5350a8ae0c150a73244ce176ae40 +refs/heads/master: dd671a39481eaf8ebd512ea8cba25d62066d078f diff --git a/trunk/drivers/staging/comedi/drivers/unioxx5.c b/trunk/drivers/staging/comedi/drivers/unioxx5.c index 6661cf72cc1f..1b19cc246ab2 100644 --- a/trunk/drivers/staging/comedi/drivers/unioxx5.c +++ b/trunk/drivers/staging/comedi/drivers/unioxx5.c @@ -375,15 +375,15 @@ static int __unioxx5_subdev_init(struct comedi_device *dev, int i, to, ndef_flag = 0; int ret; + usp = kzalloc(sizeof(*usp), GFP_KERNEL); + if (usp == NULL) + return -ENOMEM; + ret = __comedi_request_region(dev, iobase, UNIOXX5_SIZE); if (ret) return ret; usp->usp_iobase = iobase; - usp = kzalloc(sizeof(*usp), GFP_KERNEL); - if (usp == NULL) - return -ENOMEM; - /* defining modules types */ for (i = 0; i < 12; i++) { to = 10000;