diff --git a/[refs] b/[refs] index 9481fdaf9f91..4a8b4f3bd8ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bc1e212b3f1f783cae9adc5d16aa1a899dc2f82 +refs/heads/master: d994c46d4309df85aea86049024cadfcbf523116 diff --git a/trunk/drivers/staging/media/easycap/easycap_main.c b/trunk/drivers/staging/media/easycap/easycap_main.c index 95f3cc1867db..d0fe34afc2e5 100644 --- a/trunk/drivers/staging/media/easycap/easycap_main.c +++ b/trunk/drivers/staging/media/easycap/easycap_main.c @@ -3542,9 +3542,8 @@ static int easycap_usb_probe(struct usb_interface *intf, /* * It is essential to initialize the hardware before, * rather than after, the device is registered, - * because some versions of the videodev module - * call easycap_open() immediately after registration, - * causing a clash. + * because some udev rules triggers easycap_open() + * immediately after registration, causing a clash. */ peasycap->ntsc = easycap_ntsc; JOM(8, "defaulting initially to %s\n",