projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[powerpc.git]
/
sound
/
oss
/
emu10k1
/
audio.c
diff --git
a/sound/oss/emu10k1/audio.c
b/sound/oss/emu10k1/audio.c
index
49f902f
..
efcf589
100644
(file)
--- a/
sound/oss/emu10k1/audio.c
+++ b/
sound/oss/emu10k1/audio.c
@@
-1139,7
+1139,7
@@
static int emu10k1_audio_open(struct inode *inode, struct file *file)
match:
match:
- wave_dev =
(struct emu10k1_wavedevice *)
kmalloc(sizeof(struct emu10k1_wavedevice), GFP_KERNEL);
+ wave_dev = kmalloc(sizeof(struct emu10k1_wavedevice), GFP_KERNEL);
if (wave_dev == NULL) {
ERROR();
if (wave_dev == NULL) {
ERROR();
@@
-1155,7
+1155,7
@@
match:
/* Recording */
struct wiinst *wiinst;
/* Recording */
struct wiinst *wiinst;
- if ((wiinst =
(struct wiinst *)
kmalloc(sizeof(struct wiinst), GFP_KERNEL)) == NULL) {
+ if ((wiinst = kmalloc(sizeof(struct wiinst), GFP_KERNEL)) == NULL) {
ERROR();
kfree(wave_dev);
return -ENOMEM;
ERROR();
kfree(wave_dev);
return -ENOMEM;
@@
-1211,7
+1211,7
@@
match:
struct woinst *woinst;
int i;
struct woinst *woinst;
int i;
- if ((woinst =
(struct woinst *)
kmalloc(sizeof(struct woinst), GFP_KERNEL)) == NULL) {
+ if ((woinst = kmalloc(sizeof(struct woinst), GFP_KERNEL)) == NULL) {
ERROR();
kfree(wave_dev);
return -ENOMEM;
ERROR();
kfree(wave_dev);
return -ENOMEM;