Commit 5c0b7f26 authored by Ben Collins's avatar Ben Collins

[IEEE1394]: Fix compilation when CONFIG_COMPAT is enabled (32/64 systems).

  This was broken by the last commit for cdev stuff which removed the
  "int ret;" that these routines used.
parent 15ef5034
...@@ -1277,12 +1277,15 @@ static int __init amdtp_init_module (void) ...@@ -1277,12 +1277,15 @@ static int __init amdtp_init_module (void)
hpsb_register_highlevel(&amdtp_highlevel); hpsb_register_highlevel(&amdtp_highlevel);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
{
int ret;
ret = register_ioctl32_conversion(AMDTP_IOC_CHANNEL, NULL); ret = register_ioctl32_conversion(AMDTP_IOC_CHANNEL, NULL);
ret |= register_ioctl32_conversion(AMDTP_IOC_PLUG, NULL); ret |= register_ioctl32_conversion(AMDTP_IOC_PLUG, NULL);
ret |= register_ioctl32_conversion(AMDTP_IOC_PING, NULL); ret |= register_ioctl32_conversion(AMDTP_IOC_PING, NULL);
ret |= register_ioctl32_conversion(AMDTP_IOC_ZAP, NULL); ret |= register_ioctl32_conversion(AMDTP_IOC_ZAP, NULL);
if (ret) if (ret)
HPSB_ERR("amdtp: Error registering ioctl32 translations"); HPSB_ERR("amdtp: Error registering ioctl32 translations");
}
#endif #endif
HPSB_INFO("Loaded AMDTP driver"); HPSB_INFO("Loaded AMDTP driver");
......
...@@ -2631,6 +2631,9 @@ static int __init dv1394_init_module(void) ...@@ -2631,6 +2631,9 @@ static int __init dv1394_init_module(void)
hpsb_register_protocol(&dv1394_driver); hpsb_register_protocol(&dv1394_driver);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
{
int ret;
/* First compatible ones */ /* First compatible ones */
ret = register_ioctl32_conversion(DV1394_IOC_SHUTDOWN, NULL); ret = register_ioctl32_conversion(DV1394_IOC_SHUTDOWN, NULL);
ret |= register_ioctl32_conversion(DV1394_IOC_SUBMIT_FRAMES, NULL); ret |= register_ioctl32_conversion(DV1394_IOC_SUBMIT_FRAMES, NULL);
...@@ -2643,6 +2646,7 @@ static int __init dv1394_init_module(void) ...@@ -2643,6 +2646,7 @@ static int __init dv1394_init_module(void)
ret |= register_ioctl32_conversion(DV1394_IOC32_GET_STATUS, handle_dv1394_get_status); ret |= register_ioctl32_conversion(DV1394_IOC32_GET_STATUS, handle_dv1394_get_status);
if (ret) if (ret)
printk(KERN_ERR "dv1394: Error registering ioctl32 translations\n"); printk(KERN_ERR "dv1394: Error registering ioctl32 translations\n");
}
#endif #endif
return 0; return 0;
......
...@@ -1470,6 +1470,9 @@ static int __init video1394_init_module (void) ...@@ -1470,6 +1470,9 @@ static int __init video1394_init_module (void)
hpsb_register_protocol(&video1394_driver); hpsb_register_protocol(&video1394_driver);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
{
int ret;
/* First the compatible ones */ /* First the compatible ones */
ret = register_ioctl32_conversion(VIDEO1394_IOC_LISTEN_CHANNEL, NULL); ret = register_ioctl32_conversion(VIDEO1394_IOC_LISTEN_CHANNEL, NULL);
ret |= register_ioctl32_conversion(VIDEO1394_IOC_UNLISTEN_CHANNEL, NULL); ret |= register_ioctl32_conversion(VIDEO1394_IOC_UNLISTEN_CHANNEL, NULL);
...@@ -1489,6 +1492,7 @@ static int __init video1394_init_module (void) ...@@ -1489,6 +1492,7 @@ static int __init video1394_init_module (void)
video1394_wr_wait32); video1394_wr_wait32);
if (ret) if (ret)
PRINT_G(KERN_INFO, "Error registering ioctl32 translations"); PRINT_G(KERN_INFO, "Error registering ioctl32 translations");
}
#endif #endif
PRINT_G(KERN_INFO, "Installed " VIDEO1394_DRIVER_NAME " module"); PRINT_G(KERN_INFO, "Installed " VIDEO1394_DRIVER_NAME " module");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment