Skip to content

Commit

Permalink
[media] cx25840: Declare MODULE_FIRMWARE usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tim Gardner authored and Mauro Carvalho Chehab committed Jul 31, 2012
1 parent bc7892c commit 47c75f7
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions drivers/media/video/cx25840/cx25840-firmware.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,21 @@ static void end_fw_load(struct i2c_client *client)
cx25840_write(client, 0x803, 0x03);
}

#define CX2388x_FIRMWARE "v4l-cx23885-avcore-01.fw"
#define CX231xx_FIRMWARE "v4l-cx231xx-avcore-01.fw"
#define CX25840_FIRMWARE "v4l-cx25840.fw"

static const char *get_fw_name(struct i2c_client *client)
{
struct cx25840_state *state = to_state(i2c_get_clientdata(client));

if (firmware[0])
return firmware;
if (is_cx2388x(state))
return "v4l-cx23885-avcore-01.fw";
return CX2388x_FIRMWARE;
if (is_cx231xx(state))
return "v4l-cx231xx-avcore-01.fw";
return "v4l-cx25840.fw";
return CX231xx_FIRMWARE;
return CX25840_FIRMWARE;
}

static int check_fw_load(struct i2c_client *client, int size)
Expand Down Expand Up @@ -164,3 +168,8 @@ int cx25840_loadfw(struct i2c_client *client)

return check_fw_load(client, size);
}

MODULE_FIRMWARE(CX2388x_FIRMWARE);
MODULE_FIRMWARE(CX231xx_FIRMWARE);
MODULE_FIRMWARE(CX25840_FIRMWARE);

0 comments on commit 47c75f7

Please sign in to comment.