diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /drivers/sbus/char | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'drivers/sbus/char')
| -rw-r--r-- | drivers/sbus/char/flash.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/openprom.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/pcikbd.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/rtc.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/vfc_dev.c | 10 |
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 7a03036b6..8690638b3 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c @@ -1,4 +1,4 @@ -/* $Id: flash.c,v 1.18 2000/06/19 06:24:47 davem Exp $ +/* $Id: flash.c,v 1.19 2000/07/13 08:06:40 davem Exp $ * flash.c: Allow mmap access to the OBP Flash, for OBP updates. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 38e7a2ed0..c38101957 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c @@ -600,7 +600,7 @@ static int openprom_open(struct inode * inode, struct file * file) static int openprom_release(struct inode * inode, struct file * file) { - kfree_s(file->private_data, sizeof(DATA)); + kfree(file->private_data); return 0; } diff --git a/drivers/sbus/char/pcikbd.c b/drivers/sbus/char/pcikbd.c index ecce4db4b..6ddccf114 100644 --- a/drivers/sbus/char/pcikbd.c +++ b/drivers/sbus/char/pcikbd.c @@ -1,4 +1,4 @@ -/* $Id: pcikbd.c,v 1.48 2000/06/19 06:24:47 davem Exp $ +/* $Id: pcikbd.c,v 1.49 2000/07/13 08:06:40 davem Exp $ * pcikbd.c: Ultra/AX PC keyboard support. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c index 7a02f543f..0702f7a03 100644 --- a/drivers/sbus/char/rtc.c +++ b/drivers/sbus/char/rtc.c @@ -1,4 +1,4 @@ -/* $Id: rtc.c,v 1.20 2000/06/19 06:24:47 davem Exp $ +/* $Id: rtc.c,v 1.21 2000/07/13 08:06:40 davem Exp $ * * Linux/SPARC Real Time Clock Driver * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu) diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c index 7b7a59ea2..554a15676 100644 --- a/drivers/sbus/char/vfc_dev.c +++ b/drivers/sbus/char/vfc_dev.c @@ -238,7 +238,7 @@ static int vfc_debug(struct vfc_dev *dev, int cmd, unsigned long arg) if(copy_from_user(buffer, inout.buffer, inout.len*sizeof(char))) { - kfree_s(buffer, inout.len * sizeof(char)); + kfree(buffer); return -EFAULT; } @@ -249,7 +249,7 @@ static int vfc_debug(struct vfc_dev *dev, int cmd, unsigned long arg) inout.buffer,inout.len); if (copy_to_user((void *)arg,&inout,sizeof(inout))) { - kfree_s(buffer, inout.len); + kfree(buffer); return -EFAULT; } vfc_unlock_device(dev); @@ -271,14 +271,14 @@ static int vfc_debug(struct vfc_dev *dev, int cmd, unsigned long arg) vfc_unlock_device(dev); if (copy_to_user(inout.buffer, buffer, inout.len)) { - kfree_s(buffer,inout.len); + kfree(buffer); return -EFAULT; } if (copy_to_user((void *)arg,&inout,sizeof(inout))) { - kfree_s(buffer,inout.len); + kfree(buffer); return -EFAULT; } - kfree_s(buffer,inout.len); + kfree(buffer); break; default: return -EINVAL; |