diff options
Diffstat (limited to 'sound/pci/ice1712/ice1712.h')
| -rw-r--r-- | sound/pci/ice1712/ice1712.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h index ce96b3bb6531..d7416a83fcac 100644 --- a/sound/pci/ice1712/ice1712.h +++ b/sound/pci/ice1712/ice1712.h | |||
| @@ -334,7 +334,7 @@ struct snd_ice1712 { | |||
| 334 | unsigned int num_total_adcs; /* total ADCs */ | 334 | unsigned int num_total_adcs; /* total ADCs */ |
| 335 | unsigned int cur_rate; /* current rate */ | 335 | unsigned int cur_rate; /* current rate */ |
| 336 | 336 | ||
| 337 | struct semaphore open_mutex; | 337 | struct mutex open_mutex; |
| 338 | struct snd_pcm_substream *pcm_reserved[4]; | 338 | struct snd_pcm_substream *pcm_reserved[4]; |
| 339 | struct snd_pcm_hw_constraint_list *hw_rates; /* card-specific rate constraints */ | 339 | struct snd_pcm_hw_constraint_list *hw_rates; /* card-specific rate constraints */ |
| 340 | 340 | ||
| @@ -342,7 +342,7 @@ struct snd_ice1712 { | |||
| 342 | struct snd_akm4xxx *akm; | 342 | struct snd_akm4xxx *akm; |
| 343 | struct snd_ice1712_spdif spdif; | 343 | struct snd_ice1712_spdif spdif; |
| 344 | 344 | ||
| 345 | struct semaphore i2c_mutex; /* I2C mutex for ICE1724 registers */ | 345 | struct mutex i2c_mutex; /* I2C mutex for ICE1724 registers */ |
| 346 | struct snd_i2c_bus *i2c; /* I2C bus */ | 346 | struct snd_i2c_bus *i2c; /* I2C bus */ |
| 347 | struct snd_i2c_device *cs8427; /* CS8427 I2C device */ | 347 | struct snd_i2c_device *cs8427; /* CS8427 I2C device */ |
| 348 | unsigned int cs8427_timeout; /* CS8427 reset timeout in HZ/100 */ | 348 | unsigned int cs8427_timeout; /* CS8427 reset timeout in HZ/100 */ |
| @@ -360,7 +360,7 @@ struct snd_ice1712 { | |||
| 360 | void (*set_pro_rate)(struct snd_ice1712 *ice, unsigned int rate); | 360 | void (*set_pro_rate)(struct snd_ice1712 *ice, unsigned int rate); |
| 361 | void (*i2s_mclk_changed)(struct snd_ice1712 *ice); | 361 | void (*i2s_mclk_changed)(struct snd_ice1712 *ice); |
| 362 | } gpio; | 362 | } gpio; |
| 363 | struct semaphore gpio_mutex; | 363 | struct mutex gpio_mutex; |
| 364 | 364 | ||
| 365 | /* other board-specific data */ | 365 | /* other board-specific data */ |
| 366 | union { | 366 | union { |
| @@ -423,7 +423,7 @@ static inline unsigned int snd_ice1712_gpio_read(struct snd_ice1712 *ice) | |||
| 423 | */ | 423 | */ |
| 424 | static inline void snd_ice1712_save_gpio_status(struct snd_ice1712 *ice) | 424 | static inline void snd_ice1712_save_gpio_status(struct snd_ice1712 *ice) |
| 425 | { | 425 | { |
| 426 | down(&ice->gpio_mutex); | 426 | mutex_lock(&ice->gpio_mutex); |
| 427 | ice->gpio.saved[0] = ice->gpio.direction; | 427 | ice->gpio.saved[0] = ice->gpio.direction; |
| 428 | ice->gpio.saved[1] = ice->gpio.write_mask; | 428 | ice->gpio.saved[1] = ice->gpio.write_mask; |
| 429 | } | 429 | } |
| @@ -434,7 +434,7 @@ static inline void snd_ice1712_restore_gpio_status(struct snd_ice1712 *ice) | |||
| 434 | ice->gpio.set_mask(ice, ice->gpio.saved[1]); | 434 | ice->gpio.set_mask(ice, ice->gpio.saved[1]); |
| 435 | ice->gpio.direction = ice->gpio.saved[0]; | 435 | ice->gpio.direction = ice->gpio.saved[0]; |
| 436 | ice->gpio.write_mask = ice->gpio.saved[1]; | 436 | ice->gpio.write_mask = ice->gpio.saved[1]; |
| 437 | up(&ice->gpio_mutex); | 437 | mutex_unlock(&ice->gpio_mutex); |
| 438 | } | 438 | } |
| 439 | 439 | ||
| 440 | /* for bit controls */ | 440 | /* for bit controls */ |
