diff --git a/[refs] b/[refs] index 710f1c206a9d..36bea40a2022 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 484fbbeb3eed224e11f016ee212f07e698a24f97 +refs/heads/master: b3944c8f676de2e7ccd78151ae6a0518a9c44df6 diff --git a/trunk/drivers/media/usb/em28xx/em28xx-cards.c b/trunk/drivers/media/usb/em28xx/em28xx-cards.c index de15cdff5892..b745860794b3 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/usb/em28xx/em28xx-cards.c @@ -2309,11 +2309,10 @@ static int em28xx_initialize_mt9m001(struct em28xx *dev) return 0; } -/* HINT method: webcam I2C chips - * +/* * This method works for webcams with Micron sensors */ -static int em28xx_hint_sensor(struct em28xx *dev) +static int em28xx_detect_sensor(struct em28xx *dev) { int rc; char *sensor_name; @@ -2746,7 +2745,7 @@ static void em28xx_card_setup(struct em28xx *dev) * If sensor is not found, then it isn't a webcam. */ if (dev->board.is_webcam) { - if (em28xx_hint_sensor(dev) < 0) + if (em28xx_detect_sensor(dev) < 0) dev->board.is_webcam = 0; else dev->progressive = 1;