From e6f42841dfee6ad646ea1526d05f04446144bb4c Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Tue, 29 Jun 2010 01:29:29 -0300
Subject: [PATCH] --- yaml --- r: 202016 b: refs/heads/master c:
 806ec0fb561b0384f1da6932960643786eac8ec6 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/dvb/siano/smscoreapi.c | 4 +---
 trunk/drivers/media/video/w9968cf.c        | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f3ba9f6f8a63..f0efd79e7af2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e23fb9643bd440fee9106e6df76f01a57db2613c
+refs/heads/master: 806ec0fb561b0384f1da6932960643786eac8ec6
diff --git a/trunk/drivers/media/dvb/siano/smscoreapi.c b/trunk/drivers/media/dvb/siano/smscoreapi.c
index 0c87a3c3899a..828bcc2e129b 100644
--- a/trunk/drivers/media/dvb/siano/smscoreapi.c
+++ b/trunk/drivers/media/dvb/siano/smscoreapi.c
@@ -116,9 +116,7 @@ static struct smscore_registry_entry_t *smscore_find_registry(char *devpath)
 			return entry;
 		}
 	}
-	entry = (struct smscore_registry_entry_t *)
-			kmalloc(sizeof(struct smscore_registry_entry_t),
-				GFP_KERNEL);
+	entry = kmalloc(sizeof(struct smscore_registry_entry_t), GFP_KERNEL);
 	if (entry) {
 		entry->mode = default_mode;
 		strcpy(entry->devpath, devpath);
diff --git a/trunk/drivers/media/video/w9968cf.c b/trunk/drivers/media/video/w9968cf.c
index d807eea91757..591fc6db48fb 100644
--- a/trunk/drivers/media/video/w9968cf.c
+++ b/trunk/drivers/media/video/w9968cf.c
@@ -3429,8 +3429,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
 	else
 		return -ENODEV;
 
-	cam = (struct w9968cf_device*)
-		  kzalloc(sizeof(struct w9968cf_device), GFP_KERNEL);
+	cam = kzalloc(sizeof(struct w9968cf_device), GFP_KERNEL);
 	if (!cam)
 		return -ENOMEM;