2002-10-08 19:14:53

by Alan Cox

[permalink] [raw]
Subject: PATCH: trivial sound static/cast fixes

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.2.5.41/sound/oss/maestro3.c linux.2.5.41-ac1/sound/oss/maestro3.c
--- linux.2.5.41/sound/oss/maestro3.c 2002-10-07 22:12:31.000000000 +0100
+++ linux.2.5.41-ac1/sound/oss/maestro3.c 2002-10-07 23:24:44.000000000 +0100
@@ -192,8 +192,8 @@
int max;
};

-int external_amp = 1;
-int gpio_pin = -1;
+static int external_amp = 1;
+static int gpio_pin = -1;

struct m3_state {
unsigned int magic;
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.2.5.41/sound/oss/opl3sa2.c linux.2.5.41-ac1/sound/oss/opl3sa2.c
--- linux.2.5.41/sound/oss/opl3sa2.c 2002-10-02 21:33:42.000000000 +0100
+++ linux.2.5.41-ac1/sound/oss/opl3sa2.c 2002-10-06 22:15:33.000000000 +0100
@@ -978,7 +978,7 @@

static int opl3sa2_pm_callback(struct pm_dev *pdev, pm_request_t rqst, void *data)
{
- unsigned char mode = (unsigned char)data;
+ unsigned long mode = (unsigned long)data;

switch (rqst) {
case PM_SUSPEND: