diff options
| author | Axel Lin <axel.lin@gmail.com> | 2010-05-03 02:42:44 -0400 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-05-26 12:34:35 -0400 |
| commit | beb0a43f398efac87a3b9c2c6a5c5a163df50413 (patch) | |
| tree | d1be725605867375def6d0403d55716d87757055 | |
| parent | ee378a5c6550dcbfe6fa9c71b84ca2eb19cb288e (diff) | |
backlight: l4f00242t03: fix error handling in l4f00242t03_probe
Error handling fixes:
1. In the case of kzalloc failure, simple return -ENOMEM instead of goto
err. ( priv is NULL in this case )
2. In the case of gpio_request fail for reset_gpio and data_enable_gpio,
properly release resources by goto err and err2 respectively.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | drivers/video/backlight/l4f00242t03.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c index 1dafec85ddc0..9093ef0fa869 100644 --- a/drivers/video/backlight/l4f00242t03.c +++ b/drivers/video/backlight/l4f00242t03.c | |||
| @@ -125,8 +125,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi) | |||
| 125 | 125 | ||
| 126 | if (priv == NULL) { | 126 | if (priv == NULL) { |
| 127 | dev_err(&spi->dev, "No memory for this device.\n"); | 127 | dev_err(&spi->dev, "No memory for this device.\n"); |
| 128 | ret = -ENOMEM; | 128 | return -ENOMEM; |
| 129 | goto err; | ||
| 130 | } | 129 | } |
| 131 | 130 | ||
| 132 | dev_set_drvdata(&spi->dev, priv); | 131 | dev_set_drvdata(&spi->dev, priv); |
| @@ -139,7 +138,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi) | |||
| 139 | if (ret) { | 138 | if (ret) { |
| 140 | dev_err(&spi->dev, | 139 | dev_err(&spi->dev, |
| 141 | "Unable to get the lcd l4f00242t03 reset gpio.\n"); | 140 | "Unable to get the lcd l4f00242t03 reset gpio.\n"); |
| 142 | return ret; | 141 | goto err; |
| 143 | } | 142 | } |
| 144 | 143 | ||
| 145 | ret = gpio_direction_output(pdata->reset_gpio, 1); | 144 | ret = gpio_direction_output(pdata->reset_gpio, 1); |
| @@ -151,7 +150,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi) | |||
| 151 | if (ret) { | 150 | if (ret) { |
| 152 | dev_err(&spi->dev, | 151 | dev_err(&spi->dev, |
| 153 | "Unable to get the lcd l4f00242t03 data en gpio.\n"); | 152 | "Unable to get the lcd l4f00242t03 data en gpio.\n"); |
| 154 | return ret; | 153 | goto err2; |
| 155 | } | 154 | } |
| 156 | 155 | ||
| 157 | ret = gpio_direction_output(pdata->data_enable_gpio, 0); | 156 | ret = gpio_direction_output(pdata->data_enable_gpio, 0); |
