| Date: | 2012-04-09 10:44:01 (10 years 5 months ago) |
|---|---|
| Author: | Lars C. |
| Commit: | 3d14a726b6519673b7b025f46f9497020e0cd68f |
| Message: | ili8960: Use devm_kzalloc Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> |
| Files: |
drivers/video/backlight/ili8960.c (5 diffs) |
Change Details
| drivers/video/backlight/ili8960.c | ||
|---|---|---|
| 150 | 150 | int ret; |
| 151 | 151 | struct ili8960 *ili8960; |
| 152 | 152 | |
| 153 | ili8960 = kmalloc(sizeof(*ili8960), GFP_KERNEL); | |
| 153 | ili8960 = devm_kzalloc(&spi->dev, sizeof(*ili8960), GFP_KERNEL); | |
| 154 | 154 | if (!ili8960) |
| 155 | 155 | return -ENOMEM; |
| 156 | 156 | |
| ... | ... | |
| 160 | 160 | ret = spi_setup(spi); |
| 161 | 161 | if (ret) { |
| 162 | 162 | dev_err(&spi->dev, "Failed to setup spi\n"); |
| 163 | goto err_free_ili8960; | |
| 163 | return ret; | |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | ili8960->spi = spi; |
| ... | ... | |
| 171 | 171 | if (IS_ERR(ili8960->lcd)) { |
| 172 | 172 | ret = PTR_ERR(ili8960->lcd); |
| 173 | 173 | dev_err(&spi->dev, "Failed to register lcd device: %d\n", ret); |
| 174 | goto err_free_ili8960; | |
| 174 | return ret; | |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | ili8960->lcd->props.max_contrast = 255; |
| ... | ... | |
| 190 | 190 | return 0; |
| 191 | 191 | err_unregister_lcd: |
| 192 | 192 | lcd_device_unregister(ili8960->lcd); |
| 193 | err_free_ili8960: | |
| 194 | kfree(ili8960); | |
| 195 | 193 | return ret; |
| 196 | 194 | } |
| 197 | 195 | |
| ... | ... | |
| 203 | 201 | lcd_device_unregister(ili8960->lcd); |
| 204 | 202 | |
| 205 | 203 | spi_set_drvdata(spi, NULL); |
| 206 | kfree(ili8960); | |
| 207 | 204 | return 0; |
| 208 | 205 | } |
| 209 | 206 | |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9
