diff options
author | Tim Gardner <tim.gardner@canonical.com> | 2012-07-26 11:44:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-30 23:11:45 -0400 |
commit | 47c75f773c3dc4a4c3520f40c154792585935980 (patch) | |
tree | 91a6703c825fbe11b15815f62ac2fad1fc12fe76 /drivers/media/video/cx25840 | |
parent | bc7892c2142ce1eb1b0792337391414728cddf9e (diff) |
[media] cx25840: Declare MODULE_FIRMWARE usage
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx25840')
-rw-r--r-- | drivers/media/video/cx25840/cx25840-firmware.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c index 8150200511da..b3169f94ece8 100644 --- a/drivers/media/video/cx25840/cx25840-firmware.c +++ b/drivers/media/video/cx25840/cx25840-firmware.c | |||
@@ -61,6 +61,10 @@ static void end_fw_load(struct i2c_client *client) | |||
61 | cx25840_write(client, 0x803, 0x03); | 61 | cx25840_write(client, 0x803, 0x03); |
62 | } | 62 | } |
63 | 63 | ||
64 | #define CX2388x_FIRMWARE "v4l-cx23885-avcore-01.fw" | ||
65 | #define CX231xx_FIRMWARE "v4l-cx231xx-avcore-01.fw" | ||
66 | #define CX25840_FIRMWARE "v4l-cx25840.fw" | ||
67 | |||
64 | static const char *get_fw_name(struct i2c_client *client) | 68 | static const char *get_fw_name(struct i2c_client *client) |
65 | { | 69 | { |
66 | struct cx25840_state *state = to_state(i2c_get_clientdata(client)); | 70 | struct cx25840_state *state = to_state(i2c_get_clientdata(client)); |
@@ -68,10 +72,10 @@ static const char *get_fw_name(struct i2c_client *client) | |||
68 | if (firmware[0]) | 72 | if (firmware[0]) |
69 | return firmware; | 73 | return firmware; |
70 | if (is_cx2388x(state)) | 74 | if (is_cx2388x(state)) |
71 | return "v4l-cx23885-avcore-01.fw"; | 75 | return CX2388x_FIRMWARE; |
72 | if (is_cx231xx(state)) | 76 | if (is_cx231xx(state)) |
73 | return "v4l-cx231xx-avcore-01.fw"; | 77 | return CX231xx_FIRMWARE; |
74 | return "v4l-cx25840.fw"; | 78 | return CX25840_FIRMWARE; |
75 | } | 79 | } |
76 | 80 | ||
77 | static int check_fw_load(struct i2c_client *client, int size) | 81 | static int check_fw_load(struct i2c_client *client, int size) |
@@ -164,3 +168,8 @@ int cx25840_loadfw(struct i2c_client *client) | |||
164 | 168 | ||
165 | return check_fw_load(client, size); | 169 | return check_fw_load(client, size); |
166 | } | 170 | } |
171 | |||
172 | MODULE_FIRMWARE(CX2388x_FIRMWARE); | ||
173 | MODULE_FIRMWARE(CX231xx_FIRMWARE); | ||
174 | MODULE_FIRMWARE(CX25840_FIRMWARE); | ||
175 | |||