Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 15 insertions, 0 deletions

diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index f6f4508a9d42..0863f85fcc26 100644
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -204,4 +204,19 @@ struct usbatm_data {
         struct urb *urbs[0];
 };
 
+static inline void *to_usbatm_driver_data(struct usb_interface *intf)
+{
+        struct usbatm_data *usbatm_instance;
+
+        if (intf == NULL)
+                return NULL;
+
+        usbatm_instance = usb_get_intfdata(intf);
+
+        if (usbatm_instance == NULL) /* set NULL before unbind() */
+                return NULL;
+
+        return usbatm_instance->driver_data; /* set NULL after unbind() */
+}
+
 #endif  /* _USBATM_H_ */