X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fstaging%2Fcomedi%2Fdrivers%2Fni_pcidio.c;h=fcf56cf4811b77ef2ec732b20d0020401d9e706e;hb=c34fa261b0ac3a862ccd3f71ee55a16b920dfc83;hp=233a2d350e841afa79fb1bc91cd642b60759627d;hpb=a51d02067efc069aab14b221b625bd82d8e659dd;p=deliverable%2Flinux.git

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 233a2d350e84..fcf56cf4811b 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -1128,10 +1128,10 @@ static int __devinit nidio_attach_pci(struct comedi_device *dev,
 	int ret;
 	unsigned int irq;
 
-	ret = alloc_private(dev, sizeof(*devpriv));
-	if (ret)
-		return ret;
-	devpriv = dev->private;
+	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+	if (!devpriv)
+		return -ENOMEM;
+	dev->private = devpriv;
 
 	spin_lock_init(&devpriv->mite_channel_lock);