The patch titled matrox maven: fix a broken error path has been added to the -mm tree. Its filename is matrox-maven-fix-a-broken-error-path.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: matrox maven: fix a broken error path From: Jean Delvare <khali@xxxxxxxxxxxx> I broke an error path with d03c21ec0be7787ff6b75dcf56c0e96209ccbfbd, sorry about that. Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx> Acked-by: Krzysztof Helt <krzysztof.h1@xxxxx> Cc: Petr Vandrovec <VANDROVE@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/matrox/matroxfb_maven.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/video/matrox/matroxfb_maven.c~matrox-maven-fix-a-broken-error-path drivers/video/matrox/matroxfb_maven.c --- a/drivers/video/matrox/matroxfb_maven.c~matrox-maven-fix-a-broken-error-path +++ a/drivers/video/matrox/matroxfb_maven.c @@ -1266,7 +1266,7 @@ static int maven_detect_client(struct i2 ERROR4:; i2c_detach_client(new_client); ERROR3:; - kfree(new_client); + kfree(data); ERROR0:; return err; } _ Patches currently in -mm which might be from khali@xxxxxxxxxxxx are matrox-maven-fix-a-broken-error-path.patch matroxfb-i2c-structure-templates-clean-up.patch matrox-maven-convert-to-a-new-style-i2c-driver.patch linux-next.patch mm-only-enforce-acpi-resource-conflict-checks.patch i2c-renesas-highlander-fpga-smbus-support.patch i2c-renesas-highlander-fpga-smbus-support-update.patch i2c-renesas-highlander-fpga-smbus-support-update-fix.patch applesmc-support-for-intel-imac.patch applesmc-add-support-for-macbook-v3.patch hwmon-adc124s501-generic-driver.patch hwmon-adc124s501-generic-driver-update.patch i5k_amb-provide-labels-for-temperature-sensors.patch abituguru3-update-maintainers.patch radeonfb-revert-fix-radeon-ddc-regression.patch resource-add-resource_type-and-ioresource_type_bits.patch resource-add-new-ioresource_clk-type-v2.patch i2c-sh_mobile-ioresource_clk-support.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