diff options
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/trident.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/oss/trident.c b/sound/oss/trident.c index d6af9065d1c0..f43f91ef86c7 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c | |||
@@ -3076,8 +3076,7 @@ ali_ac97_get(struct trident_card *card, int secondary, u8 reg) | |||
3076 | u16 wcontrol; | 3076 | u16 wcontrol; |
3077 | unsigned long flags; | 3077 | unsigned long flags; |
3078 | 3078 | ||
3079 | if (!card) | 3079 | BUG_ON(!card); |
3080 | BUG(); | ||
3081 | 3080 | ||
3082 | address = ALI_AC97_READ; | 3081 | address = ALI_AC97_READ; |
3083 | if (card->revision == ALI_5451_V02) { | 3082 | if (card->revision == ALI_5451_V02) { |
@@ -3148,8 +3147,7 @@ ali_ac97_set(struct trident_card *card, int secondary, u8 reg, u16 val) | |||
3148 | 3147 | ||
3149 | data = ((u32) val) << 16; | 3148 | data = ((u32) val) << 16; |
3150 | 3149 | ||
3151 | if (!card) | 3150 | BUG_ON(!card); |
3152 | BUG(); | ||
3153 | 3151 | ||
3154 | address = ALI_AC97_WRITE; | 3152 | address = ALI_AC97_WRITE; |
3155 | mask = ALI_AC97_WRITE_ACTION | ALI_AC97_AUDIO_BUSY; | 3153 | mask = ALI_AC97_WRITE_ACTION | ALI_AC97_AUDIO_BUSY; |
@@ -3213,8 +3211,7 @@ ali_ac97_read(struct ac97_codec *codec, u8 reg) | |||
3213 | struct trident_card *card = NULL; | 3211 | struct trident_card *card = NULL; |
3214 | 3212 | ||
3215 | /* Added by Matt Wu */ | 3213 | /* Added by Matt Wu */ |
3216 | if (!codec) | 3214 | BUG_ON(!codec); |
3217 | BUG(); | ||
3218 | 3215 | ||
3219 | card = (struct trident_card *) codec->private_data; | 3216 | card = (struct trident_card *) codec->private_data; |
3220 | 3217 | ||
@@ -3240,8 +3237,7 @@ ali_ac97_write(struct ac97_codec *codec, u8 reg, u16 val) | |||
3240 | struct trident_card *card; | 3237 | struct trident_card *card; |
3241 | 3238 | ||
3242 | /* Added by Matt Wu */ | 3239 | /* Added by Matt Wu */ |
3243 | if (!codec) | 3240 | BUG_ON(!codec); |
3244 | BUG(); | ||
3245 | 3241 | ||
3246 | card = (struct trident_card *) codec->private_data; | 3242 | card = (struct trident_card *) codec->private_data; |
3247 | 3243 | ||