d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Probe the CS4231 in USIII machines.

Browse Source 
- Remove unused variables. [1]

Reported by:	Coverity Prevent (CID 700, 701) [1]
This commit is contained in:
Marius Strobl 2007-01-18 19:19:19 +00:00
parent da1fa91ac0
commit 3284c150d2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/sound/sbus/cs4231.c
View File

@ -306,10 +306,12 @@ MIXER_DECLARE(cs4231_mixer);
static int
cs4231_bus_probe(device_t dev)
{
const char *name;
const char *compat, *name;
compat = ofw_bus_get_compat(dev);
name = ofw_bus_get_name(dev);
if (strcmp("SUNW,CS4231", name) == 0) {
if (strcmp("SUNW,CS4231", name) == 0 ||
(compat != NULL && strcmp("SUNW,CS4231", compat) == 0)) {
device_set_desc(dev, "Sun Audiocs");
return (BUS_PROBE_DEFAULT);
}
@ -319,11 +321,9 @@ cs4231_bus_probe(device_t dev)
static int
cs4231_sbus_attach(device_t dev)
{
struct snddev_info *d;
struct cs4231_softc *sc;
int burst;
d = device_get_softc(dev);
sc = malloc(sizeof(struct cs4231_softc), M_DEVBUF, M_NOWAIT | M_ZERO);
if (sc == NULL) {
device_printf(dev, "cannot allocate softc\n");
@ -352,10 +352,8 @@ cs4231_sbus_attach(device_t dev)
static int
cs4231_ebus_attach(device_t dev)
{
struct snddev_info *d;
struct cs4231_softc *sc;
d = device_get_softc(dev);
sc = malloc(sizeof(struct cs4231_softc), M_DEVBUF, M_NOWAIT | M_ZERO);
if (sc == NULL) {
device_printf(dev, "cannot allocate softc\n");