diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
| commit | 4dd565134ece7e5d528d4c5288879310c54419e9 (patch) | |
| tree | e08910d2d0feae0c030f8f01acc9b03eb760ad9a /drivers/media/video/wm8739.c | |
| parent | 071d7ab6649eb34a873a53e71635186e9117101d (diff) | |
| parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'drivers/media/video/wm8739.c')
| -rw-r--r-- | drivers/media/video/wm8739.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c index 95c79ad80487..54ac3fe26ec2 100644 --- a/drivers/media/video/wm8739.c +++ b/drivers/media/video/wm8739.c | |||
| @@ -274,10 +274,8 @@ static int wm8739_probe(struct i2c_client *client, | |||
| 274 | client->addr << 1, client->adapter->name); | 274 | client->addr << 1, client->adapter->name); |
| 275 | 275 | ||
| 276 | state = kmalloc(sizeof(struct wm8739_state), GFP_KERNEL); | 276 | state = kmalloc(sizeof(struct wm8739_state), GFP_KERNEL); |
| 277 | if (state == NULL) { | 277 | if (state == NULL) |
| 278 | kfree(client); | ||
| 279 | return -ENOMEM; | 278 | return -ENOMEM; |
| 280 | } | ||
| 281 | state->vol_l = 0x17; /* 0dB */ | 279 | state->vol_l = 0x17; /* 0dB */ |
| 282 | state->vol_r = 0x17; /* 0dB */ | 280 | state->vol_r = 0x17; /* 0dB */ |
| 283 | state->muted = 0; | 281 | state->muted = 0; |