diff options
| author | Stelian Pop <stelian@popies.net> | 2004-11-18 23:00:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-18 23:00:07 -0800 |
| commit | afc62cbf517c63aedd04037b92b7acd3dfa297d5 (patch) | |
| tree | 7a4327cbaba61666361d95a2b2ca98fdd9d3b4ed /include/linux | |
| parent | eaede9da09f586ea9d27a4a3fffd73db21924401 (diff) | |
[PATCH] sonypi: return an error from sonypi_camera_command() if the camera isn't enabled
The sonypi_camera_command() used to fail without returning an error code if
the user fergot to enable the camera in the sonypi module (using the
camera=1 module parameter). This caused the meye driver to apparently load
correctly but miserably fail later, when trying to access the camera for
getting some data out of it.
This patch adds an error code to sonypi_camera_command() and makes the meye
driver check for it in the PCI probe routine. If the function fails, a
message is printed in the kernel logs reminding the user it should better
RTFM.
The patch also removes some sonypi_camera_command() commands (those
supposed to return the current camera settings) which are unreliable. The
meye driver does not use them anyway.
Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sonypi.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h index fd8d3a931827..388d573e12a6 100644 --- a/include/linux/sonypi.h +++ b/include/linux/sonypi.h @@ -122,27 +122,27 @@ /* used only for communication between v4l and sonypi */ -#define SONYPI_COMMAND_GETCAMERA 1 +#define SONYPI_COMMAND_GETCAMERA 1 /* obsolete */ #define SONYPI_COMMAND_SETCAMERA 2 -#define SONYPI_COMMAND_GETCAMERABRIGHTNESS 3 +#define SONYPI_COMMAND_GETCAMERABRIGHTNESS 3 /* obsolete */ #define SONYPI_COMMAND_SETCAMERABRIGHTNESS 4 -#define SONYPI_COMMAND_GETCAMERACONTRAST 5 +#define SONYPI_COMMAND_GETCAMERACONTRAST 5 /* obsolete */ #define SONYPI_COMMAND_SETCAMERACONTRAST 6 -#define SONYPI_COMMAND_GETCAMERAHUE 7 +#define SONYPI_COMMAND_GETCAMERAHUE 7 /* obsolete */ #define SONYPI_COMMAND_SETCAMERAHUE 8 -#define SONYPI_COMMAND_GETCAMERACOLOR 9 +#define SONYPI_COMMAND_GETCAMERACOLOR 9 /* obsolete */ #define SONYPI_COMMAND_SETCAMERACOLOR 10 -#define SONYPI_COMMAND_GETCAMERASHARPNESS 11 +#define SONYPI_COMMAND_GETCAMERASHARPNESS 11 /* obsolete */ #define SONYPI_COMMAND_SETCAMERASHARPNESS 12 -#define SONYPI_COMMAND_GETCAMERAPICTURE 13 +#define SONYPI_COMMAND_GETCAMERAPICTURE 13 /* obsolete */ #define SONYPI_COMMAND_SETCAMERAPICTURE 14 -#define SONYPI_COMMAND_GETCAMERAAGC 15 +#define SONYPI_COMMAND_GETCAMERAAGC 15 /* obsolete */ #define SONYPI_COMMAND_SETCAMERAAGC 16 -#define SONYPI_COMMAND_GETCAMERADIRECTION 17 -#define SONYPI_COMMAND_GETCAMERAROMVERSION 18 -#define SONYPI_COMMAND_GETCAMERAREVISION 19 +#define SONYPI_COMMAND_GETCAMERADIRECTION 17 /* obsolete */ +#define SONYPI_COMMAND_GETCAMERAROMVERSION 18 /* obsolete */ +#define SONYPI_COMMAND_GETCAMERAREVISION 19 /* obsolete */ -u8 sonypi_camera_command(int command, u8 value); +int sonypi_camera_command(int command, u8 value); #endif /* __KERNEL__ */ |