Skip to content

Commit

Permalink
V4L/DVB (11078): au0828: properly handle non-existent analog inputs
Browse files Browse the repository at this point in the history
It is not valid to look for dev->board.input == NULL to detect an undefined
analog configuration section, since it is a member of the struct and not a
pointer (hence it will *always* be non-NULL).  Do the check based on whether
the first input is actually a valid input type instead.

Thanks to Michael Krufky <mkrufky@linuxtv.org> for providing sample hardware
of various configurations to test with.

Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent fc4ce6c commit 220be77
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/media/video/au0828/au0828-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ void au0828_card_setup(struct au0828_dev *dev)
break;
}

if (dev->board.input != NULL) {
if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED) {
/* Load the analog demodulator driver (note this would need to
be abstracted out if we ever need to support a different
demod) */
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/video/au0828/au0828-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
/* Digital TV */
au0828_dvb_unregister(dev);

if (dev->board.input != NULL)
if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED)
au0828_analog_unregister(dev);

/* I2C */
Expand Down Expand Up @@ -205,7 +205,7 @@ static int au0828_usb_probe(struct usb_interface *interface,
au0828_card_setup(dev);

/* Analog TV */
if (dev->board.input != NULL)
if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED)
au0828_analog_register(dev, interface);

/* Digital TV */
Expand Down
3 changes: 2 additions & 1 deletion drivers/media/video/au0828/au0828.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
#define AU0828_MAX_INPUT 4

enum au0828_itype {
AU0828_VMUX_COMPOSITE = 1,
AU0828_VMUX_UNDEFINED = 0,
AU0828_VMUX_COMPOSITE,
AU0828_VMUX_SVIDEO,
AU0828_VMUX_CABLE,
AU0828_VMUX_TELEVISION,
Expand Down

0 comments on commit 220be77

Please sign in to comment.