Merge branch 'linus' into core/rcu

[linux-2.6-omap-h63xx.git] / drivers / usb / atm / cxacru.c

diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 5ea3093bc40f0ddea25b87252c1ef61a4f7ff878..507a9bd0d77caa6267caa7c52f4c108a5082c959 100644 (file)
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -820,7 +820,7 @@ reschedule:
 }
 
 static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw,
-                    u8 code1, u8 code2, u32 addr, u8 *data, int size)
+                    u8 code1, u8 code2, u32 addr, const u8 *data, int size)
 {
        int ret;
        u8 *buf;
@@ -1052,7 +1052,6 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance,
 
        instance->usbatm = usbatm_instance;
        instance->modem_type = (struct cxacru_modem_type *) id->driver_info;
-       memset(instance->card_info, 0, sizeof(instance->card_info));
 
        mutex_init(&instance->poll_state_serialize);
        instance->poll_state = CXPOLL_STOPPED;