diff options
-rw-r--r-- | drivers/media/i2c/smiapp/smiapp-core.c | 9 | ||||
-rw-r--r-- | include/media/smiapp.h | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c index 7de9892fb6c9..ae66d91bf713 100644 --- a/drivers/media/i2c/smiapp/smiapp-core.c +++ b/drivers/media/i2c/smiapp/smiapp-core.c | |||
@@ -2363,11 +2363,9 @@ static int smiapp_registered(struct v4l2_subdev *subdev) | |||
2363 | } | 2363 | } |
2364 | 2364 | ||
2365 | if (!sensor->platform_data->set_xclk) { | 2365 | if (!sensor->platform_data->set_xclk) { |
2366 | sensor->ext_clk = devm_clk_get(&client->dev, | 2366 | sensor->ext_clk = devm_clk_get(&client->dev, "ext_clk"); |
2367 | sensor->platform_data->ext_clk_name); | ||
2368 | if (IS_ERR(sensor->ext_clk)) { | 2367 | if (IS_ERR(sensor->ext_clk)) { |
2369 | dev_err(&client->dev, "could not get clock %s\n", | 2368 | dev_err(&client->dev, "could not get clock\n"); |
2370 | sensor->platform_data->ext_clk_name); | ||
2371 | return -ENODEV; | 2369 | return -ENODEV; |
2372 | } | 2370 | } |
2373 | 2371 | ||
@@ -2375,8 +2373,7 @@ static int smiapp_registered(struct v4l2_subdev *subdev) | |||
2375 | sensor->platform_data->ext_clk); | 2373 | sensor->platform_data->ext_clk); |
2376 | if (rval < 0) { | 2374 | if (rval < 0) { |
2377 | dev_err(&client->dev, | 2375 | dev_err(&client->dev, |
2378 | "unable to set clock %s freq to %u\n", | 2376 | "unable to set clock freq to %u\n", |
2379 | sensor->platform_data->ext_clk_name, | ||
2380 | sensor->platform_data->ext_clk); | 2377 | sensor->platform_data->ext_clk); |
2381 | return -ENODEV; | 2378 | return -ENODEV; |
2382 | } | 2379 | } |
diff --git a/include/media/smiapp.h b/include/media/smiapp.h index 07f96a89e189..0b8f124a630c 100644 --- a/include/media/smiapp.h +++ b/include/media/smiapp.h | |||
@@ -77,7 +77,6 @@ struct smiapp_platform_data { | |||
77 | struct smiapp_flash_strobe_parms *strobe_setup; | 77 | struct smiapp_flash_strobe_parms *strobe_setup; |
78 | 78 | ||
79 | int (*set_xclk)(struct v4l2_subdev *sd, int hz); | 79 | int (*set_xclk)(struct v4l2_subdev *sd, int hz); |
80 | char *ext_clk_name; | ||
81 | int xshutdown; /* gpio or SMIAPP_NO_XSHUTDOWN */ | 80 | int xshutdown; /* gpio or SMIAPP_NO_XSHUTDOWN */ |
82 | }; | 81 | }; |
83 | 82 | ||