git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
oss
/
dmasound
/
tas3001c.c
diff --git
a/sound/oss/dmasound/tas3001c.c
b/sound/oss/dmasound/tas3001c.c
index
f227c9f
..
2f21a3c
100644
(file)
--- a/
sound/oss/dmasound/tas3001c.c
+++ b/
sound/oss/dmasound/tas3001c.c
@@
-50,6
+50,7
@@
struct tas3001c_data_t {
int output_id;
int speaker_id;
struct tas_drce_t drce_state;
int output_id;
int speaker_id;
struct tas_drce_t drce_state;
+ struct work_struct change;
};
};
@@
-667,14
+668,13
@@
tas3001c_update_device_parameters(struct tas3001c_data_t *self)
}
static void
}
static void
-tas3001c_device_change_handler(
void *self
)
+tas3001c_device_change_handler(
struct work_struct *work
)
{
{
- if (self)
- tas3001c_update_device_parameters(self);
+ struct tas3001c_data_t *self;
+ self = container_of(work, struct tas3001c_data_t, change);
+ tas3001c_update_device_parameters(self);
}
}
-static struct work_struct device_change;
-
static int
tas3001c_output_device_change( struct tas3001c_data_t *self,
int device_id,
static int
tas3001c_output_device_change( struct tas3001c_data_t *self,
int device_id,
@@
-685,7
+685,7
@@
tas3001c_output_device_change( struct tas3001c_data_t *self,
self->output_id=output_id;
self->speaker_id=speaker_id;
self->output_id=output_id;
self->speaker_id=speaker_id;
- schedule_work(&
device_
change);
+ schedule_work(&
self->
change);
return 0;
}
return 0;
}
@@
-823,7
+823,7
@@
tas3001c_init(struct i2c_client *client)
tas3001c_write_biquad_shadow(self, i, j,
&tas3001c_eq_unity);
tas3001c_write_biquad_shadow(self, i, j,
&tas3001c_eq_unity);
- INIT_WORK(&
device_change, tas3001c_device_change_handler, self
);
+ INIT_WORK(&
self->change, tas3001c_device_change_handler
);
return 0;
}
return 0;
}