diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c index 065042db69f782c45254e7ea036f98e7d5bccdea..9a7fd71e1461640144c8815fae54e86ce95eccdb 100644 --- a/drivers/w1/masters/ds2490.c +++ b/drivers/w1/masters/ds2490.c @@ -457,7 +457,7 @@ static int ds_wait_status(struct ds_device *dev, struct ds_status *st) return 0; } -static int ds_reset(struct ds_device *dev, struct ds_status *st) +static int ds_reset(struct ds_device *dev) { int err; @@ -466,14 +466,6 @@ static int ds_reset(struct ds_device *dev, struct ds_status *st) if (err) return err; - ds_wait_status(dev, st); -#if 0 - if (st->command_buffer_status) { - printk(KERN_INFO "Short circuit.\n"); - return -EIO; - } -#endif - return 0; } @@ -809,12 +801,9 @@ static u8 ds9490r_read_block(void *data, u8 *buf, int len) static u8 ds9490r_reset(void *data) { struct ds_device *dev = data; - struct ds_status st; int err; - memset(&st, 0, sizeof(st)); - - err = ds_reset(dev, &st); + err = ds_reset(dev); if (err) return 1;