On Sun, Oct 10, 2010 at 09:29:04PM +0400, Vasiliy Kulikov wrote: > kzalloc() returns NULL on error, not ERR_PTR(). > Also wm8804_modinit() didn't called i2c_del_driver() if > spi_register_driver() failed. > > Signed-off-by: Vasiliy Kulikov <segooon@xxxxxxxxx> Please try to follow Documentation/SubmittingPatches - in particular, you should always split unrelated changes into separate patches. In this case your I2C and kzalloc() changes have nothing to do with each other and so should be in separate patches, and the kzalloc() changes were already applied from a patch by someone else. For the registration changes... > @@ -804,6 +804,7 @@ static int __init wm8804_modinit(void) > if (ret) { > printk(KERN_ERR "Failed to register wm8804 I2C driver: %d\n", > ret); > + goto err; > } > #endif > #if defined(CONFIG_SPI_MASTER) ...it's not clear to me that this change is an improvement - it'll make the driver more fragile in the face of errors, I don't see a benefit in refusing to register the variant for one bus if the other fails? -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html