summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Toso <me@victortoso.com>2018-10-30 12:14:49 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-12-03 13:26:21 -0500
commitbac26a63f9bff338534610232c2827b877e0b312 (patch)
treeed70557b4282fd7bd719f8390093ea02aaf13246
parent09a446d27843e4de43af5b0f3ed7fb7c013fc7b6 (diff)
downloadlinux-bac26a63f9bff338534610232c2827b877e0b312.tar.bz2
media: dvb: Use WARM definition from identify_state()
Device should be either COLD or WARM. This change only make usage of the existing definition. Signed-off-by: Victor Toso <me@victortoso.com> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--drivers/media/usb/dvb-usb-v2/dvb_usb_core.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index 3b8f7931b730..d55ef016d418 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -957,9 +957,7 @@ int dvb_usbv2_probe(struct usb_interface *intf,
if (d->props->identify_state) {
const char *name = NULL;
ret = d->props->identify_state(d, &name);
- if (ret == 0) {
- ;
- } else if (ret == COLD) {
+ if (ret == COLD) {
dev_info(&d->udev->dev,
"%s: found a '%s' in cold state\n",
KBUILD_MODNAME, d->name);
@@ -984,7 +982,7 @@ int dvb_usbv2_probe(struct usb_interface *intf,
} else {
goto err_free_all;
}
- } else {
+ } else if (ret != WARM) {
goto err_free_all;
}
}