diff options
Diffstat (limited to 'drivers/w1/masters/ds2490.c')
-rw-r--r-- | drivers/w1/masters/ds2490.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c index 637677833da5..299e274d241a 100644 --- a/drivers/w1/masters/ds2490.c +++ b/drivers/w1/masters/ds2490.c | |||
@@ -169,7 +169,7 @@ static int ds_send_control(struct ds_device *, u16, u16); | |||
169 | static int ds_send_control_cmd(struct ds_device *, u16, u16); | 169 | static int ds_send_control_cmd(struct ds_device *, u16, u16); |
170 | 170 | ||
171 | static LIST_HEAD(ds_devices); | 171 | static LIST_HEAD(ds_devices); |
172 | static DECLARE_MUTEX(ds_mutex); | 172 | static DEFINE_MUTEX(ds_mutex); |
173 | 173 | ||
174 | static struct usb_driver ds_driver = { | 174 | static struct usb_driver ds_driver = { |
175 | .name = "DS9490R", | 175 | .name = "DS9490R", |
@@ -887,9 +887,9 @@ static int ds_probe(struct usb_interface *intf, | |||
887 | if (err) | 887 | if (err) |
888 | goto err_out_clear; | 888 | goto err_out_clear; |
889 | 889 | ||
890 | down(&ds_mutex); | 890 | mutex_lock(&ds_mutex); |
891 | list_add_tail(&dev->ds_entry, &ds_devices); | 891 | list_add_tail(&dev->ds_entry, &ds_devices); |
892 | up(&ds_mutex); | 892 | mutex_unlock(&ds_mutex); |
893 | 893 | ||
894 | return 0; | 894 | return 0; |
895 | 895 | ||
@@ -909,9 +909,9 @@ static void ds_disconnect(struct usb_interface *intf) | |||
909 | if (!dev) | 909 | if (!dev) |
910 | return; | 910 | return; |
911 | 911 | ||
912 | down(&ds_mutex); | 912 | mutex_lock(&ds_mutex); |
913 | list_del(&dev->ds_entry); | 913 | list_del(&dev->ds_entry); |
914 | up(&ds_mutex); | 914 | mutex_unlock(&ds_mutex); |
915 | 915 | ||
916 | ds_w1_fini(dev); | 916 | ds_w1_fini(dev); |
917 | 917 | ||