aboutsummaryrefslogtreecommitdiff
path: root/sys/i386/isa/sound/patmgr.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386/isa/sound/patmgr.c')
-rw-r--r--sys/i386/isa/sound/patmgr.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/i386/isa/sound/patmgr.c b/sys/i386/isa/sound/patmgr.c
index b4c4dc614359..fc201dd9c9b4 100644
--- a/sys/i386/isa/sound/patmgr.c
+++ b/sys/i386/isa/sound/patmgr.c
@@ -1,7 +1,7 @@
/*
* sound/patmgr.c
*
- * The patch manager interface for the /dev/sequencer
+ * The patch maneger interface for the /dev/sequencer
*
* Copyright by Hannu Savolainen 1993
*
@@ -25,7 +25,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * patmgr.c,v 1.7 1994/10/01 02:16:58 swallace Exp
*/
#define PATMGR_C
@@ -132,7 +131,7 @@ pmgr_write (int dev, struct fileinfo *file, snd_rw_buf * buf, int count)
return RET_ERROR (EIO);
}
- COPY_FROM_USER ((caddr_t)mbox[dev], buf, 0, 4);
+ COPY_FROM_USER (mbox[dev], buf, 0, 4);
if (*(unsigned char *) mbox[dev] == SEQ_FULLSIZE)
{
@@ -235,8 +234,12 @@ pmgr_inform (int dev, int event, unsigned long p1, unsigned long p2,
printk (" PATMGR: Server %d mbox full. Why?\n", dev);
else
{
- mbox[dev] =
- (struct patmgr_info *) KERNEL_MALLOC (sizeof (struct patmgr_info));
+ if ((mbox[dev] =
+ (struct patmgr_info *) KERNEL_MALLOC (sizeof (struct patmgr_info))) == NULL)
+ {
+ printk ("pmgr: Couldn't allocate memory for a message\n");
+ return 0;
+ }
mbox[dev]->key = PM_K_EVENT;
mbox[dev]->command = event;