V4L/DVB (9645): em28xx: Avoid memory leaks if registration fails

em28xx_init_dev() has some error conditions that are not properly
de-allocating dev var, nor freeing the device number for a future usage.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

+5 -4
+5 -4
drivers/media/video/em28xx/em28xx-video.c
··· 1953 errCode = em28xx_config(dev); 1954 if (errCode) { 1955 em28xx_errdev("error configuring device\n"); 1956 - em28xx_devused &= ~(1<<dev->devno); 1957 - kfree(dev); 1958 return -ENOMEM; 1959 } 1960 ··· 2086 fail_unreg: 2087 em28xx_release_resources(dev); 2088 mutex_unlock(&dev->lock); 2089 - kfree(dev); 2090 return retval; 2091 } 2092 ··· 2228 2229 /* allocate device struct */ 2230 retval = em28xx_init_dev(&dev, udev, nr); 2231 - if (retval) 2232 return retval; 2233 2234 em28xx_info("Found %s\n", em28xx_boards[dev->model].name); 2235
··· 1953 errCode = em28xx_config(dev); 1954 if (errCode) { 1955 em28xx_errdev("error configuring device\n"); 1956 return -ENOMEM; 1957 } 1958 ··· 2088 fail_unreg: 2089 em28xx_release_resources(dev); 2090 mutex_unlock(&dev->lock); 2091 return retval; 2092 } 2093 ··· 2231 2232 /* allocate device struct */ 2233 retval = em28xx_init_dev(&dev, udev, nr); 2234 + if (retval) { 2235 + em28xx_devused &= ~(1<<dev->devno); 2236 + kfree(dev); 2237 + 2238 return retval; 2239 + } 2240 2241 em28xx_info("Found %s\n", em28xx_boards[dev->model].name); 2242