Merge branch 'tbsdtv_linux_media/master' into tbsdtv_linux_media/latest

This commit is contained in:
CrazyCat
2024-10-03 23:06:59 +03:00
2 changed files with 5 additions and 2 deletions

View File

@@ -25,8 +25,11 @@
#endif
/* MACRO definitions */
#ifndef MIN
#define MAX(X, Y) ((X) >= (Y) ? (X) : (Y))
#define MIN(X, Y) ((X) <= (Y) ? (X) : (Y))
#endif
#define INRANGE(X, Y, Z) \
((((X) <= (Y)) && ((Y) <= (Z))) || \
(((Z) <= (Y)) && ((Y) <= (X))) ? 1 : 0)

View File

@@ -28,9 +28,9 @@
/* ----------------------------------------------------------------------- */
/* internal: the bttv "bus" */
static int bttv_sub_bus_match(struct device *dev, struct device_driver *drv)
static int bttv_sub_bus_match(struct device *dev, const struct device_driver *drv)
{
struct bttv_sub_driver *sub = to_bttv_sub_drv(drv);
const struct bttv_sub_driver *sub = to_bttv_sub_drv(drv);
int len = strlen(sub->wanted);
if (0 == strncmp(dev_name(dev), sub->wanted, len))