diff --git a/[refs] b/[refs] index a085a9150f23..b165d7cc39a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12897dc37648ac48b2aa2b3bb2d7df69625b6de5 +refs/heads/master: 07ca418891187f97464309a0eedc266cabd948c7 diff --git a/trunk/drivers/media/v4l2-core/v4l2-common.c b/trunk/drivers/media/v4l2-core/v4l2-common.c index b6ee929f7ba5..f995dd31151d 100644 --- a/trunk/drivers/media/v4l2-core/v4l2-common.c +++ b/trunk/drivers/media/v4l2-core/v4l2-common.c @@ -443,7 +443,7 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev, BUG_ON(!v4l2_dev); - if (info->modalias) + if (info->modalias[0]) request_module(info->modalias); spi = spi_new_device(master, info);