From 77a3ade4d09fa31a6e3d71d92d866405334bf68d Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Wed, 9 Mar 2011 03:53:38 +0300 Subject: [PATCH] --- yaml --- r: 236347 b: refs/heads/master c: 1840c15b0a504fed6ee08b475245a964336b76e6 h: refs/heads/master i: 236345: 9249877fea294a5cace25be9cc036a1c97fdfa79 236343: ad0f85c44019288513fcd6a00ae4aa54bc46c3fe v: v3 --- [refs] | 2 +- trunk/drivers/staging/rts_pstor/rtsx.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 95fdc75b2b2d..7592ecb1f342 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12d0eb47ddd20cf8f1e8d768b0f8f81984902a60 +refs/heads/master: 1840c15b0a504fed6ee08b475245a964336b76e6 diff --git a/trunk/drivers/staging/rts_pstor/rtsx.c b/trunk/drivers/staging/rts_pstor/rtsx.c index c3f33d1de465..db3470e93fa1 100644 --- a/trunk/drivers/staging/rts_pstor/rtsx.c +++ b/trunk/drivers/staging/rts_pstor/rtsx.c @@ -931,11 +931,10 @@ static int __devinit rtsx_probe(struct pci_dev *pci, const struct pci_device_id dev = host_to_rtsx(host); memset(dev, 0, sizeof(struct rtsx_dev)); - dev->chip = (struct rtsx_chip *)kmalloc(sizeof(struct rtsx_chip), GFP_KERNEL); + dev->chip = kzalloc(sizeof(struct rtsx_chip), GFP_KERNEL); if (dev->chip == NULL) { goto errout; } - memset(dev->chip, 0, sizeof(struct rtsx_chip)); spin_lock_init(&dev->reg_lock); mutex_init(&(dev->dev_mutex));