diff mbox

Use dev->bus_id instead of dev_name in pre 2.6.26 kernels

Message ID 200912091112.16352.laurent.pinchart@ideasonboard.com (mailing list archive)
State Accepted
Delegated to: Douglas Landgraf
Headers show

Commit Message

Laurent Pinchart Dec. 9, 2009, 10:12 a.m. UTC 
None
diff mbox

Patch

diff -r 065f9e34e07b linux/include/media/v4l2-dev.h
--- a/linux/include/media/v4l2-dev.h	Mon Dec 07 10:08:33 2009 -0200
+++ b/linux/include/media/v4l2-dev.h	Wed Dec 09 11:04:51 2009 +0100
@@ -156,8 +156,12 @@ 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
 	return vdev->dev.class_id;
 #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+	return vdev->dev.bus_id;
+#else
 	return dev_name(&vdev->dev);
 #endif
+#endif
 }
 
 static inline int video_is_registered(struct video_device *vdev)