diff --git a/[refs] b/[refs] index c286b8baf1e5..81d641423f9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b6f5dc07ae008c58ea27e91a7b1dfbbd0f6972a +refs/heads/master: 9d5f4839cc098f15a48f7063d39805ddfe84565c diff --git a/trunk/drivers/media/v4l2-core/v4l2-common.c b/trunk/drivers/media/v4l2-core/v4l2-common.c index b81f274e60b0..a9e7703560ad 100644 --- a/trunk/drivers/media/v4l2-core/v4l2-common.c +++ b/trunk/drivers/media/v4l2-core/v4l2-common.c @@ -251,9 +251,6 @@ int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match if (c->driver == NULL || c->driver->driver.name == NULL) return 0; len = strlen(c->driver->driver.name); - /* legacy drivers have a ' suffix, don't try to match that */ - if (len && c->driver->driver.name[len - 1] == '\'') - len--; return len && !strncmp(c->driver->driver.name, match->name, len); case V4L2_CHIP_MATCH_I2C_ADDR: return c->addr == match->addr;