The patch titled v4l: fix return value of meye probe callback has been removed from the -mm tree. Its filename was v4l-fix-return-value-of-meye-probe-callback.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: v4l: fix return value of meye probe callback From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx> The return value of the probe function should return -ENOMEM instead of -EBUSY if video_device_alloc() fails. Signed-off-by: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/media/video/meye.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/media/video/meye.c~v4l-fix-return-value-of-meye-probe-callback drivers/media/video/meye.c --- a/drivers/media/video/meye.c~v4l-fix-return-value-of-meye-probe-callback +++ a/drivers/media/video/meye.c @@ -1779,6 +1779,7 @@ static int __devinit meye_probe(struct p goto outnotdev; } + ret = -ENOMEM; meye.mchip_dev = pcidev; meye.video_dev = video_device_alloc(); if (!meye.video_dev) { @@ -1786,7 +1787,6 @@ static int __devinit meye_probe(struct p goto outnotdev; } - ret = -ENOMEM; meye.grab_temp = vmalloc(MCHIP_NB_PAGES_MJPEG * PAGE_SIZE); if (!meye.grab_temp) { printk(KERN_ERR "meye: grab buffer allocation failed\n"); _ Patches currently in -mm which might be from henne@xxxxxxxxxxxxxxxx are linux-next.patch v4l-fix-retval-in-vivi-driver-for-more-than-one-device.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