| From stable-bounces@linux.kernel.org Sat Nov 19 12:21:35 2005 |
| Date: Sat, 19 Nov 2005 08:58:12 +0100 |
| From: Adrian Bunk <bunk@stusta.de> |
| To: mac@melware.de |
| Message-ID: <20051119075812.GC16060@stusta.de> |
| Content-Disposition: inline |
| Cc: kai.germaschewski@gmx.de, isdn4linux@listserv.isdn4linux.de, stable@kernel.org, kkeil@suse.de |
| Subject: drivers/isdn/hardware/eicon/os_4bri.c: correct the xdiLoadFile() signature |
| |
| It's not good if caller and callee disagree regarding the type of the |
| arguments. |
| |
| In this case, this could cause problems on 64bit architectures. |
| |
| |
| Signed-off-by: Adrian Bunk <bunk@stusta.de> |
| Signed-off-by: Armin Schindler <armin@melware.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| Signed-off-by: Chris Wright <chrisw@osdl.org> |
| --- |
| drivers/isdn/hardware/eicon/os_4bri.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- linux-2.6.14.2.orig/drivers/isdn/hardware/eicon/os_4bri.c |
| +++ linux-2.6.14.2/drivers/isdn/hardware/eicon/os_4bri.c |
| @@ -16,6 +16,7 @@ |
| #include "diva_pci.h" |
| #include "mi_pc.h" |
| #include "dsrv4bri.h" |
| +#include "helpers.h" |
| |
| static void *diva_xdiLoadFileFile = NULL; |
| static dword diva_xdiLoadFileLength = 0; |
| @@ -815,7 +816,7 @@ diva_4bri_cmd_card_proc(struct _diva_os_ |
| return (ret); |
| } |
| |
| -void *xdiLoadFile(char *FileName, unsigned long *FileLength, |
| +void *xdiLoadFile(char *FileName, dword *FileLength, |
| unsigned long lim) |
| { |
| void *ret = diva_xdiLoadFileFile; |
