diff options
| author |   Thierry Reding <treding@nvidia.com> | 2014-11-26 09:41:09 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:42:11 +0100 |
| commit | 7f06dd61248a75668bbb39b6fcca6ff407745df8 (patch) | |
| tree | 30cefbd6f503d20557e24a1765a027687170a7da /drivers/media/usb/dvb-usb-v2/af9035.c | |
| parent | Linux 3.18-rc1 (diff) | |
| parent | powerpc/iommu: Rename iommu_[un]map_sg functions (diff) | |
| download | linux-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.tar.xz linux-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.zip | |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
This branch contains a couple of changes that will conflict with the
Tegra SMMU driver rewrite. Since the driver is largely rewritten the
conflict resolution is non-trivial.
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/af9035.c')
| -rw-r--r-- | drivers/media/usb/dvb-usb-v2/af9035.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c index 00758c83eec7..1896ab218b11 100644 --- a/drivers/media/usb/dvb-usb-v2/af9035.c +++ b/drivers/media/usb/dvb-usb-v2/af9035.c @@ -193,8 +193,8 @@ static int af9035_wr_reg_mask(struct dvb_usb_device *d, u32 reg, u8 val, return af9035_wr_regs(d, reg, &val, 1); } -static int af9035_add_i2c_dev(struct dvb_usb_device *d, char *type, u8 addr, - void *platform_data, struct i2c_adapter *adapter) +static int af9035_add_i2c_dev(struct dvb_usb_device *d, const char *type, + u8 addr, void *platform_data, struct i2c_adapter *adapter) { int ret, num; struct state *state = d_to_priv(d); @@ -221,7 +221,7 @@ static int af9035_add_i2c_dev(struct dvb_usb_device *d, char *type, u8 addr, goto err; } - request_module(board_info.type); + request_module("%s", board_info.type); /* register I2C device */ client = i2c_new_device(adapter, &board_info); |