Merge tag 'media/v7.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

torvalds · torvalds · commit 4bf5d3da79c4 · 2026-05-18T08:45:32.000-07:00
Pull media fix from Mauro Carvalho Chehab:
 "Fix inverted error logic in ttusbir driver"

* tag 'media/v7.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: rc: ttusbir: fix inverted error logic
diff --git a/drivers/media/rc/ttusbir.c b/drivers/media/rc/ttusbir.c
@@ -191,7 +191,7 @@ static int ttusbir_probe(struct usb_interface *intf,
 	tt = kzalloc_obj(*tt);
 	buffer = kzalloc(5, GFP_KERNEL);
 	rc = rc_allocate_device(RC_DRIVER_IR_RAW);
-	if (!tt || !rc || buffer) {
+	if (!tt || !rc || !buffer) {
 		ret = -ENOMEM;
 		goto out;
 	}

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ static int ttusbir_probe(struct usb_interface *intf,`
`191`	`191`	`tt = kzalloc_obj(*tt);`
`192`	`192`	`buffer = kzalloc(5, GFP_KERNEL);`
`193`	`193`	`rc = rc_allocate_device(RC_DRIVER_IR_RAW);`
`194`		`- if (!tt \|\| !rc \|\| buffer) {`
	`194`	`+ if (!tt \|\| !rc \|\| !buffer) {`
`195`	`195`	`ret = -ENOMEM;`
`196`	`196`	`goto out;`
`197`	`197`	`}`