[folded] backlight-lp855x_blc-check-platform-data-in-lp855x_probe.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: backlight/lp855x_bl.c: check platform data in lp855x_probe()
has been removed from the -mm tree.  Its filename was
     backlight-lp855x_blc-check-platform-data-in-lp855x_probe.patch

This patch was dropped because it was folded into backlight-new-backlight-driver-for-lp855x-devices.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
From: Axel Lin <axel.lin@xxxxxxxxx>
Subject: backlight/lp855x_bl.c: check platform data in lp855x_probe()

The reset of the code assumes pdata is not NULL.  Add checking for pdata
in lp855x_probe(), this prevents NULL dereference if pdata is NULL.

Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Cc: Richard Purdie <rpurdie@xxxxxxxxx>
Cc: "Milo(Woogyom) Kim" <milo.kim@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/video/backlight/lp855x_bl.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff -puN drivers/video/backlight/lp855x_bl.c~backlight-lp855x_blc-check-platform-data-in-lp855x_probe drivers/video/backlight/lp855x_bl.c
--- a/drivers/video/backlight/lp855x_bl.c~backlight-lp855x_blc-check-platform-data-in-lp855x_probe
+++ a/drivers/video/backlight/lp855x_bl.c
@@ -231,9 +231,14 @@ static int lp855x_probe(struct i2c_clien
 {
 	struct lp855x *lp;
 	struct lp855x_platform_data *pdata = cl->dev.platform_data;
-	enum lp855x_brightness_ctrl_mode mode = pdata->mode;
+	enum lp855x_brightness_ctrl_mode mode;
 	int ret;
 
+	if (!pdata) {
+		dev_err(&cl->dev, "no platform data supplied\n");
+		return -EINVAL;
+	}
+
 	if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
 		return -EIO;
 
@@ -241,6 +246,7 @@ static int lp855x_probe(struct i2c_clien
 	if (!lp)
 		return -ENOMEM;
 
+	mode = pdata->mode;
 	lp->client = cl;
 	lp->dev = &cl->dev;
 	lp->pdata = pdata;
_

Patches currently in -mm which might be from axel.lin@xxxxxxxxx are

origin.patch
backlight-convert-backlight-i2c-drivers-to-module_i2c_driver.patch
backlight-convert-backlight-spi-drivers-to-module_spi_driver.patch
backlight-new-backlight-driver-for-lp855x-devices.patch
backlight-lp855x_blc-small-cleanups.patch
lp855x-bl-remove-unnecessary-platform-data.patch
lp855x-bl-remove-unnecessary-headers.patch
backlight-use-id-driver_data-to-differentiate-lp855x-chips.patch
drivers-leds-add-driver-for-pca9663-i2c-chip.patch
leds-lm3530-replace-pltfm-with-pdata.patch
drivers-leds-leds-pca9633c-remove-unused-adapter-variable.patch
drivers-leds-leds-lm3530c-move-the-code-setting-gen_config-to-one-place.patch
rtc-convert-rtc-spi-drivers-to-module_spi_driver.patch
rtc-convert-rtc-i2c-drivers-to-module_i2c_driver.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux