---

yaml --- r: 236347 b: refs/heads/master c: 1840c15 h: refs/heads/master i: 236345: 9249877 236343: ad0f85c v: v3
git-mirror · Mar 9, 2011 · 77a3ade · 77a3ade
1 parent dabdcbf
commit 77a3ade
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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));