From: mchehab@infradead.org
To: linux-kernel@vger.kernel.org
Cc: linux-dvb-maintainer@linuxtv.org, Jeff Garzik <jeff@garzik.org>,
Mauro Carvalho Chehab <mchehab@infradead.org>
Subject: [PATCH 12/18] V4L/DVB (4741): {ov511,stv680}: handle sysfs errors
Date: Sat, 14 Oct 2006 09:00:51 -0300 [thread overview]
Message-ID: <20061014120051.PS20654600012@infradead.org> (raw)
In-Reply-To: <20061014115356.PS36551000000@infradead.org>
From: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/ov511.c | 58 ++++++++++++++++++++++++++++++++++--------
drivers/media/video/stv680.c | 53 +++++++++++++++++++++++++++++++-------
2 files changed, 90 insertions(+), 21 deletions(-)
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index ce4886f..b4db2cb 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -5648,17 +5648,49 @@ static ssize_t show_exposure(struct clas
}
static CLASS_DEVICE_ATTR(exposure, S_IRUGO, show_exposure, NULL);
-static void ov_create_sysfs(struct video_device *vdev)
+static int ov_create_sysfs(struct video_device *vdev)
{
- video_device_create_file(vdev, &class_device_attr_custom_id);
- video_device_create_file(vdev, &class_device_attr_model);
- video_device_create_file(vdev, &class_device_attr_bridge);
- video_device_create_file(vdev, &class_device_attr_sensor);
- video_device_create_file(vdev, &class_device_attr_brightness);
- video_device_create_file(vdev, &class_device_attr_saturation);
- video_device_create_file(vdev, &class_device_attr_contrast);
- video_device_create_file(vdev, &class_device_attr_hue);
- video_device_create_file(vdev, &class_device_attr_exposure);
+ int rc;
+
+ rc = video_device_create_file(vdev, &class_device_attr_custom_id);
+ if (rc) goto err;
+ rc = video_device_create_file(vdev, &class_device_attr_model);
+ if (rc) goto err_id;
+ rc = video_device_create_file(vdev, &class_device_attr_bridge);
+ if (rc) goto err_model;
+ rc = video_device_create_file(vdev, &class_device_attr_sensor);
+ if (rc) goto err_bridge;
+ rc = video_device_create_file(vdev, &class_device_attr_brightness);
+ if (rc) goto err_sensor;
+ rc = video_device_create_file(vdev, &class_device_attr_saturation);
+ if (rc) goto err_bright;
+ rc = video_device_create_file(vdev, &class_device_attr_contrast);
+ if (rc) goto err_sat;
+ rc = video_device_create_file(vdev, &class_device_attr_hue);
+ if (rc) goto err_contrast;
+ rc = video_device_create_file(vdev, &class_device_attr_exposure);
+ if (rc) goto err_hue;
+
+ return 0;
+
+err_hue:
+ video_device_remove_file(vdev, &class_device_attr_hue);
+err_contrast:
+ video_device_remove_file(vdev, &class_device_attr_contrast);
+err_sat:
+ video_device_remove_file(vdev, &class_device_attr_saturation);
+err_bright:
+ video_device_remove_file(vdev, &class_device_attr_brightness);
+err_sensor:
+ video_device_remove_file(vdev, &class_device_attr_sensor);
+err_bridge:
+ video_device_remove_file(vdev, &class_device_attr_bridge);
+err_model:
+ video_device_remove_file(vdev, &class_device_attr_model);
+err_id:
+ video_device_remove_file(vdev, &class_device_attr_custom_id);
+err:
+ return rc;
}
/****************************************************************************
@@ -5817,7 +5849,11 @@ #endif
ov->vdev->minor);
usb_set_intfdata(intf, ov);
- ov_create_sysfs(ov->vdev);
+ if (ov_create_sysfs(ov->vdev)) {
+ err("ov_create_sysfs failed");
+ goto error;
+ }
+
return 0;
error:
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index 87e1130..6d1ef1e 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -516,16 +516,45 @@ stv680_file(frames_read, framecount, "%d
stv680_file(packets_dropped, dropped, "%d\n");
stv680_file(decoding_errors, error, "%d\n");
-static void stv680_create_sysfs_files(struct video_device *vdev)
+static int stv680_create_sysfs_files(struct video_device *vdev)
{
- video_device_create_file(vdev, &class_device_attr_model);
- video_device_create_file(vdev, &class_device_attr_in_use);
- video_device_create_file(vdev, &class_device_attr_streaming);
- video_device_create_file(vdev, &class_device_attr_palette);
- video_device_create_file(vdev, &class_device_attr_frames_total);
- video_device_create_file(vdev, &class_device_attr_frames_read);
- video_device_create_file(vdev, &class_device_attr_packets_dropped);
- video_device_create_file(vdev, &class_device_attr_decoding_errors);
+ int rc;
+
+ rc = video_device_create_file(vdev, &class_device_attr_model);
+ if (rc) goto err;
+ rc = video_device_create_file(vdev, &class_device_attr_in_use);
+ if (rc) goto err_model;
+ rc = video_device_create_file(vdev, &class_device_attr_streaming);
+ if (rc) goto err_inuse;
+ rc = video_device_create_file(vdev, &class_device_attr_palette);
+ if (rc) goto err_stream;
+ rc = video_device_create_file(vdev, &class_device_attr_frames_total);
+ if (rc) goto err_pal;
+ rc = video_device_create_file(vdev, &class_device_attr_frames_read);
+ if (rc) goto err_framtot;
+ rc = video_device_create_file(vdev, &class_device_attr_packets_dropped);
+ if (rc) goto err_framread;
+ rc = video_device_create_file(vdev, &class_device_attr_decoding_errors);
+ if (rc) goto err_dropped;
+
+ return 0;
+
+err_dropped:
+ video_device_remove_file(vdev, &class_device_attr_packets_dropped);
+err_framread:
+ video_device_remove_file(vdev, &class_device_attr_frames_read);
+err_framtot:
+ video_device_remove_file(vdev, &class_device_attr_frames_total);
+err_pal:
+ video_device_remove_file(vdev, &class_device_attr_palette);
+err_stream:
+ video_device_remove_file(vdev, &class_device_attr_streaming);
+err_inuse:
+ video_device_remove_file(vdev, &class_device_attr_in_use);
+err_model:
+ video_device_remove_file(vdev, &class_device_attr_model);
+err:
+ return rc;
}
static void stv680_remove_sysfs_files(struct video_device *vdev)
@@ -1418,9 +1447,13 @@ static int stv680_probe (struct usb_inte
usb_set_intfdata (intf, stv680);
- stv680_create_sysfs_files(stv680->vdev);
+ retval = stv680_create_sysfs_files(stv680->vdev);
+ if (retval)
+ goto error_unreg;
return 0;
+error_unreg:
+ video_unregister_device(stv680->vdev);
error_vdev:
video_device_release(stv680->vdev);
error:
next prev parent reply other threads:[~2006-10-14 12:07 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-14 11:53 [PATCH 00/18] V4L/DVB fixes mchehab
2006-10-14 12:00 ` [PATCH 08/18] V4L/DVB (4734): Tda826x: fix frontend selection for dvb_attach mchehab
2006-10-14 12:16 ` Adrian Bunk
2006-10-14 18:10 ` Michael Krufky
2006-10-14 18:33 ` Adrian Bunk
2006-10-14 18:57 ` Michael Krufky
2006-10-14 19:14 ` Adrian Bunk
2006-10-15 1:55 ` Mauro Carvalho Chehab
2006-10-15 12:38 ` Adrian Bunk
2006-10-16 0:01 ` [v4l-dvb-maintainer] " Trent Piepho
2006-10-14 12:00 ` [PATCH 03/18] V4L/DVB (4727): Support status readout for saa713x based FM radio mchehab
2006-10-14 12:00 ` [PATCH 02/18] V4L/DVB (4725): Fix vivi compile on parisc mchehab
2006-10-14 12:00 ` [PATCH 09/18] V4L/DVB (4738): Bt8xx/dvb-bt8xx.c: check kmalloc() return value mchehab
2006-10-14 12:00 ` [PATCH 01/18] V4L/DVB (4692): Add WinTV-HVR3000 DVB-T support mchehab
2006-10-14 12:00 ` [PATCH 06/18] V4L/DVB (4732): Fix spelling error in Kconfig help text for DVB_CORE_ATTACH mchehab
2006-10-14 12:00 ` [PATCH 04/18] V4L/DVB (4729): Fix VIDIOC_G_FMT for NTSC in cx25840 mchehab
2006-10-14 12:00 ` [PATCH 05/18] V4L/DVB (4731a): Kconfig: restore pvrusb2 menu items mchehab
2006-10-14 12:00 ` [PATCH 07/18] V4L/DVB (4733): Tda10086: fix frontend selection for dvb_attach mchehab
2006-10-14 12:14 ` Adrian Bunk
2006-10-14 18:12 ` Michael Krufky
2006-10-14 18:33 ` Adrian Bunk
2006-10-14 12:00 ` mchehab [this message]
2006-10-14 12:00 ` [PATCH 10/18] V4L/DVB (4739): SECAM support for saa7113 into saa7115 mchehab
2006-10-14 12:00 ` [PATCH 11/18] V4L/DVB (4740): Fixed an if-block to avoid floating with debug-messages mchehab
2006-10-14 12:00 ` [PATCH 17/18] V4L/DVB (4748): Fixed oops for Nova-T USB2 mchehab
2006-10-14 12:00 ` [PATCH 14/18] V4L/DVB (4743): Fix oops in VIDIOC_G_PARM mchehab
2006-10-14 12:00 ` [PATCH 18/18] V4L/DVB (4750): AGC command1/2 is board specific mchehab
2006-10-14 12:00 ` [PATCH 16/18] V4L/DVB (4746): HM12 is YUV 4:2:0, not YUV 4:1:1 mchehab
2006-10-14 12:00 ` [PATCH 13/18] V4L/DVB (4742): Drivers/media/video: handle sysfs errors mchehab
2006-10-14 12:00 ` [PATCH 15/18] V4L/DVB (4744): The Samsung TCPN2121P30A does not have a tda9887 mchehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061014120051.PS20654600012@infradead.org \
--to=mchehab@infradead.org \
--cc=jeff@garzik.org \
--cc=linux-dvb-maintainer@linuxtv.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®