[PATCH] sscape.c: include missing restore_flags

Arnaldo Carvalho de Melo (acme@conectiva.com.br)
Tue, 9 Jan 2001 10:00:38 -0200


Alan,

Please apply.

- Arnaldo

--- linux-2.4.0-ac4/drivers/sound/sscape.c Mon Jan 8 20:39:30 2001
+++ linux-2.4.0-ac4.acme/drivers/sound/sscape.c Tue Jan 9 09:16:39 2001
@@ -16,6 +16,7 @@
* Christoph Hellwig : adapted to module_init/module_exit
* Bartlomiej Zolnierkiewicz : added __init to attach_sscape()
* Chris Rankin : Specify that this module owns the coprocessor
+ * Arnaldo C. de Melo : added missing restore_flags in sscape_pnp_upload_file
*/

#include <linux/init.h>
@@ -969,7 +970,10 @@
memcpy(devc->raw_buf, dt, l); dt += l;
sscape_start_dma(devc->dma, devc->raw_buf_phys, l, 0x48);
sscape_pnp_start_dma ( devc, 0 );
- if (sscape_pnp_wait_dma ( devc, 0 ) == 0) return 0;
+ if (sscape_pnp_wait_dma ( devc, 0 ) == 0) {
+ restore_flags(flags);
+ return 0;
+ }
}

restore_flags(flags);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/