patch-1.3.36 linux/drivers/sound/sound_switch.c

Next file: linux/drivers/sound/sound_timer.c
Previous file: linux/drivers/sound/sound_config.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.35/linux/drivers/sound/sound_switch.c linux/drivers/sound/sound_switch.c
@@ -314,7 +314,7 @@
   if (l <= 0)
     return 0;
 
-  memcpy_tofs (&((buf)[0]), (&status_buf[status_ptr]), (l));
+  memcpy_tofs (&((buf)[0]), &status_buf[status_ptr], l);
   status_ptr += l;
 
   return l;
@@ -405,11 +405,7 @@
       if (status_busy)
 	return -EBUSY;
       status_busy = 1;
-      if ((status_buf = (char *) (
-				   {
-			       caddr_t x; x = kmalloc (4000, GFP_KERNEL); x;
-				   }
-	   )) == NULL)
+      if ((status_buf = (char *) kmalloc (4000, GFP_KERNEL)) == NULL)
 	return -EIO;
       status_len = status_ptr = 0;
       init_status ();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this