diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-av-firmware.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-av-firmware.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c index 940ea9352115..49a55cc8d839 100644 --- a/drivers/media/video/cx18/cx18-av-firmware.c +++ b/drivers/media/video/cx18/cx18-av-firmware.c | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | int cx18_av_loadfw(struct cx18 *cx) | 30 | int cx18_av_loadfw(struct cx18 *cx) |
31 | { | 31 | { |
32 | struct v4l2_subdev *sd = &cx->av_state.sd; | ||
32 | const struct firmware *fw = NULL; | 33 | const struct firmware *fw = NULL; |
33 | u32 size; | 34 | u32 size; |
34 | u32 v; | 35 | u32 v; |
@@ -37,7 +38,7 @@ int cx18_av_loadfw(struct cx18 *cx) | |||
37 | int retries1 = 0; | 38 | int retries1 = 0; |
38 | 39 | ||
39 | if (request_firmware(&fw, FWFILE, &cx->pci_dev->dev) != 0) { | 40 | if (request_firmware(&fw, FWFILE, &cx->pci_dev->dev) != 0) { |
40 | CX18_ERR("unable to open firmware %s\n", FWFILE); | 41 | CX18_ERR_DEV(sd, "unable to open firmware %s\n", FWFILE); |
41 | return -EINVAL; | 42 | return -EINVAL; |
42 | } | 43 | } |
43 | 44 | ||
@@ -88,7 +89,7 @@ int cx18_av_loadfw(struct cx18 *cx) | |||
88 | retries1++; | 89 | retries1++; |
89 | } | 90 | } |
90 | if (retries1 >= 5) { | 91 | if (retries1 >= 5) { |
91 | CX18_ERR("unable to load firmware %s\n", FWFILE); | 92 | CX18_ERR_DEV(sd, "unable to load firmware %s\n", FWFILE); |
92 | release_firmware(fw); | 93 | release_firmware(fw); |
93 | return -EIO; | 94 | return -EIO; |
94 | } | 95 | } |
@@ -143,6 +144,6 @@ int cx18_av_loadfw(struct cx18 *cx) | |||
143 | 144 | ||
144 | release_firmware(fw); | 145 | release_firmware(fw); |
145 | 146 | ||
146 | CX18_INFO("loaded %s firmware (%d bytes)\n", FWFILE, size); | 147 | CX18_INFO_DEV(sd, "loaded %s firmware (%d bytes)\n", FWFILE, size); |
147 | return 0; | 148 | return 0; |
148 | } | 149 | } |