The patch titled Subject: drivers/w1/slaves/w1_bq27000.c: fix the error handling in w1_bq27000_add_slave() has been removed from the -mm tree. Its filename was drivers-w1-slaves-w1_bq27000c-fix-the-error-handling-in-w1_bq27000_add_slave.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> Subject: drivers/w1/slaves/w1_bq27000.c: fix the error handling in w1_bq27000_add_slave() Use platform_device_put() instead of platform_device_unregister() if platform_device_add() fails, and also add the return value check of platform_device_add_data(). Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> Cc: Evgeniy Polyakov <zbr@xxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Cc: Neil Brown <neilb@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/w1/slaves/w1_bq27000.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN drivers/w1/slaves/w1_bq27000.c~drivers-w1-slaves-w1_bq27000c-fix-the-error-handling-in-w1_bq27000_add_slave drivers/w1/slaves/w1_bq27000.c --- a/drivers/w1/slaves/w1_bq27000.c~drivers-w1-slaves-w1_bq27000c-fix-the-error-handling-in-w1_bq27000_add_slave +++ a/drivers/w1/slaves/w1_bq27000.c @@ -57,6 +57,8 @@ static int w1_bq27000_add_slave(struct w ret = platform_device_add_data(pdev, &bq27000_battery_info, sizeof(bq27000_battery_info)); + if (ret) + goto pdev_add_failed; pdev->dev.parent = &sl->dev; ret = platform_device_add(pdev); @@ -68,7 +70,7 @@ static int w1_bq27000_add_slave(struct w goto success; pdev_add_failed: - platform_device_unregister(pdev); + platform_device_put(pdev); success: return ret; } _ Patches currently in -mm which might be from yongjun_wei@xxxxxxxxxxxxxxxxx are origin.patch linux-next.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